DNA Splicers WIP

2025-12-07 21:24:59 +00:00 · 2025-05-08 22:59:30 -04:00
parent 6536fcda77
commit 4ecf97b777
287 changed files with 5291 additions and 31635 deletions
--- a/windows/002_MessageConfig.rb
+++ b/windows/002_MessageConfig.rb
@@ -562,7 +562,7 @@ end
 # Fades out the screen before a block is run and fades it back in after the
 # block exits.  z indicates the z-coordinate of the viewport used for this effect
 def pbFadeOutIn(z = 99999, nofadeout = false)
-  duration = 0.4   # In seconds
+  duration = 0.1   # In seconds
  col = Color.new(0, 0, 0, 0)
  viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
  viewport.z = z
--- a/Data/Scripts/998_InfiniteFusion/01_GlobalVariables/PIF_GameTemp.rb
+++ b/Data/Scripts/998_InfiniteFusion/01_GlobalVariables/PIF_GameTemp.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class Game_Temp
+  attr_accessor :unimportedSprites
+  attr_accessor :nb_imported_sprites
+  attr_accessor :loading_screen
+  attr_accessor :custom_sprites_list
+  attr_accessor :base_sprites_list
+  attr_accessor :forced_alt_sprites
+
+  alias pokemonEssentials_GameTemp_original_initialize initialize
+  def initialize
+    pokemonEssentials_GameTemp_original_initialize
+    @custom_sprites_list    ={}
+    @base_sprites_list    ={}
+  end
+end
--- a/Data/Scripts/998_InfiniteFusion/02_Migration/020_UI_PokeMart.rb
+++ b/Data/Scripts/998_InfiniteFusion/02_Migration/020_UI_PokeMart.rb
--- a/Data/Scripts/998_InfiniteFusion/02_Migration/BagMigration.rb
+++ b/Data/Scripts/998_InfiniteFusion/02_Migration/BagMigration.rb
--- a/Data/Scripts/998_InfiniteFusion/02_Migration/MessageConfig.rb
+++ b/Data/Scripts/998_InfiniteFusion/02_Migration/MessageConfig.rb
--- a/Data/Scripts/998_InfiniteFusion/02_Migration/Migration_Species.rb
+++ b/Data/Scripts/998_InfiniteFusion/02_Migration/Migration_Species.rb
@@ -0,0 +1,37 @@
+module GameData
+  class Species
+    def id_number
+      return (GameData::Species.keys.index(@id) || 0) + 1
+    end
+
+
+    def type1
+      return @types[0]
+    end
+
+    def type2
+      return @types[-1]
+    end
+
+    def is_fusion
+      return id_number > Settings::NB_POKEMON
+    end
+
+    def is_triple_fusion
+      return id_number >= Settings::ZAPMOLCUNO_NB
+    end
+    def get_body_species
+      return @species
+    end
+
+    def get_head_species
+      return @species
+    end
+    def hasType?(type)
+      type = GameData::Type.get(type).id
+      return self.types.include?(type)
+    end
+
+  end
+end
+
--- a/Data/Scripts/998_InfiniteFusion/02_Migration/Overrides/GeneralPIF_Scene_Map.rb
+++ b/Data/Scripts/998_InfiniteFusion/02_Migration/Overrides/GeneralPIF_Scene_Map.rb
--- a/Data/Scripts/998_InfiniteFusion/02_Migration/Overrides/GeneralPIF_UIParty.rb
+++ b/Data/Scripts/998_InfiniteFusion/02_Migration/Overrides/GeneralPIF_UIParty.rb
@@ -0,0 +1,12 @@
+  def pbChoosePokemon(helptext,index_game_var=1, name_game_var=2, able_proc = nil, _allow_ineligible = false)
+    set_help_text(_INTL(helptext))
+    chosen = -1
+    pbFadeOutIn do
+      screen = UI::Party.new($player.party, mode: :choose_pokemon)
+      screen.set_able_annotation_proc(able_proc) if able_proc
+      chosen = screen.choose_pokemon
+    end
+    pbSet(index_game_var, chosen)
+    pbSet(name_game_var, (chosen >= 0) ? $player.party[chosen].name : "")
+    return chosen
+  end
--- a/Data/Scripts/998_InfiniteFusion/Fusion/DoublePreviewScreen.rb
+++ b/Data/Scripts/998_InfiniteFusion/Fusion/DoublePreviewScreen.rb
@@ -0,0 +1,225 @@
+class DoublePreviewScreen
+  SELECT_ARROW_X_LEFT= 100
+  SELECT_ARROW_X_RIGHT= 350
+  SELECT_ARROW_X_CANCEL= 230
+
+  SELECT_ARROW_Y_SELECT= 0
+  SELECT_ARROW_Y_CANCEL= 210
+  ARROW_GRAPHICS_PATH = "Graphics/Pictures/Fusion/selHand"
+  CANCEL_BUTTON_PATH = "Graphics/Pictures/Fusion/previewScreen_Cancel"
+  BACKGROUND_PATH = "Graphics/Pictures/Fusion/shadeFull_"
+
+
+  CANCEL_BUTTON_X= 140
+  CANCEL_BUTTON_Y= 260
+
+  def initialize(species_left, species_right)
+    @species_left = species_left
+    @species_right = species_right
+
+    @typewindows = []
+    @picture1 = nil
+    @picture2 = nil
+    @draw_types = nil
+    @draw_level = nil
+    @draw_sprite_info = nil
+    @selected = 0
+    @last_post=0
+    @sprites      = {}
+
+    initializeBackground
+    initializeSelectArrow
+    initializeCancelButton
+  end
+
+  def getBackgroundPicture
+    return BACKGROUND_PATH
+  end
+
+
+  def getSelection
+    selected = startSelection
+    @sprites["cancel"].visible=false
+    #@sprites["arrow"].visible=false
+
+    #todo: il y a un fuck en quelque part.... en attendant ca marche inversé ici
+    return @species_left if selected == 0
+    return @species_right if selected == 1
+    return -1
+  end
+
+  def startSelection
+    loop do
+      Graphics.update
+      Input.update
+      updateSelection
+      if Input.trigger?(Input::USE)
+        return @selected
+      end
+      if Input.trigger?(Input::BACK)
+        return -1
+      end
+    end
+  end
+
+  def updateSelection
+    currentSelected = @selected
+    updateSelectionIndex
+    if @selected != currentSelected
+      updateSelectionGraphics
+    end
+  end
+
+  def updateSelectionIndex
+    if Input.trigger?(Input::LEFT)
+      @selected = 0
+    elsif Input.trigger?(Input::RIGHT)
+      @selected = 1
+    end
+    if @selected == -1
+      if Input.trigger?(Input::UP)
+        @selected = @last_post
+      end
+    else
+      if Input.trigger?(Input::DOWN)
+        @last_post = @selected
+        @selected = -1
+      end
+    end
+  end
+
+  def updateSelectionGraphics
+    if @selected == 0
+      @sprites["arrow"].x = SELECT_ARROW_X_LEFT
+      @sprites["arrow"].y = SELECT_ARROW_Y_SELECT
+    elsif @selected == 1
+      @sprites["arrow"].x = SELECT_ARROW_X_RIGHT
+      @sprites["arrow"].y = SELECT_ARROW_Y_SELECT
+    else
+      @sprites["arrow"].x = SELECT_ARROW_X_CANCEL
+      @sprites["arrow"].y = SELECT_ARROW_Y_CANCEL
+    end
+    pbUpdateSpriteHash(@sprites)
+  end
+
+  def draw_window(dexNumber, level, x, y)
+    body_pokemon = getBodyID(dexNumber)
+    head_pokemon = getHeadID(dexNumber, body_pokemon)
+
+    # picturePath = getPicturePath(head_pokemon, body_pokemon)
+    # bitmap = AnimatedBitmap.new(picturePath)
+    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)
+    previewwindow = PictureWindow.new(bitmap)
+    previewwindow.x = x
+    previewwindow.y = y
+    previewwindow.z = 100000
+
+    drawFusionInformation(dexNumber, level, x)
+
+    if !$Trainer.seen?(dexNumber)
+      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)  #white
+      end
+    end
+    return previewwindow
+  end
+
+
+  def drawFusionInformation(fusedDexNum, level, x = 0)
+    viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
+    @typewindows << drawPokemonType(fusedDexNum, viewport, x + 55, 220) if @draw_types
+    drawFusionPreviewText(viewport, "Lv. " + level.to_s, x + 80, 40,) if @draw_level
+    drawSpriteInfoIcons(getPokemon(fusedDexNum),viewport) if @draw_sprite_info
+  end
+
+
+  def initializeSelectArrow
+    @sprites["arrow"] = IconSprite.new(0, 0, @viewport)
+    @sprites["arrow"].setBitmap(ARROW_GRAPHICS_PATH)
+    @sprites["arrow"].x = SELECT_ARROW_X_LEFT
+    @sprites["arrow"].y = SELECT_ARROW_Y_SELECT
+    @sprites["arrow"].z = 100001
+  end
+
+
+  def initializeCancelButton()
+    @sprites["cancel"] = IconSprite.new(0, 0, @viewport)
+    @sprites["cancel"].setBitmap(CANCEL_BUTTON_PATH)
+    @sprites["cancel"].x = CANCEL_BUTTON_X
+    @sprites["cancel"].y = CANCEL_BUTTON_Y
+    @sprites["cancel"].z = 100000
+  end
+
+  def initializeBackground()
+    @sprites["background"] = IconSprite.new(0, 0, @viewport)
+    @sprites["background"].setBitmap(getBackgroundPicture)
+    @sprites["background"].x = 0
+    @sprites["background"].y = 0
+    @sprites["background"].z = 99999
+  end
+
+  def drawFusionPreviewText(viewport, text, x, y)
+    label_base_color = Color.new(248, 248, 248)
+    label_shadow_color = Color.new(104, 104, 104)
+    overlay = BitmapSprite.new(Graphics.width, Graphics.height, viewport).bitmap
+    textpos = [[text, x, y, 0, label_base_color, label_shadow_color]]
+    pbDrawTextPositions(overlay, textpos)
+  end
+
+  #todo
+  # Adds the icons indicating if the fusion has alt sprites and if the final evo has a custom sprite
+  # also add a second icon to indidcate if the final evolution has a custom
+  def drawSpriteInfoIcons(fusedPokemon, viewport)
+    #pokedexUtils = PokedexUtils.new
+    #hasAltSprites = pokedexUtils.pbGetAvailableAlts(fusedPokemon).size>1
+    #pokedexUtils.getFinalEvolution(fusedPokemon).real_name
+    #todo
+  end
+
+  def dispose
+    @picture1.dispose
+    @picture2.dispose
+    for typeWindow in @typewindows
+      typeWindow.dispose
+    end
+    pbDisposeSpriteHash(@sprites)
+
+  end
+
+  def drawPokemonType(pokemon_id, viewport, x_pos = 192, y_pos = 264)
+    width = 66
+    viewport.z = 1000001
+    overlay = BitmapSprite.new(Graphics.width, Graphics.height, viewport).bitmap
+
+    pokemon = GameData::Species.get(pokemon_id)
+    typebitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/types"))
+
+    echoln pokemon
+    echoln pokemon.types
+    echoln pokemon.id
+
+    type1_number = GameData::Type.get(pokemon.type1).icon_position
+    type2_number = GameData::Type.get(pokemon.type2).icon_position if pokemon.type2
+
+    type1rect = Rect.new(0, type1_number * 28, 64, 28)
+    type2rect = Rect.new(0, type2_number * 28, 64, 28)
+    if pokemon.type1 == pokemon.type2
+      overlay.blt(x_pos + (width / 2), y_pos, typebitmap.bitmap, type1rect)
+    else
+      overlay.blt(x_pos, y_pos, typebitmap.bitmap, type1rect)
+      overlay.blt(x_pos + width, y_pos, typebitmap.bitmap, type2rect)
+    end
+    return viewport
+  end
+
+end
--- a/Data/Scripts/998_InfiniteFusion/Fusion/Fusing.rb
+++ b/Data/Scripts/998_InfiniteFusion/Fusion/Fusing.rb
@@ -9,28 +9,19 @@ end

 # don't remember why there's two Supersplicers arguments.... probably a mistake
 def pbDNASplicing(pokemon, scene, item = :DNASPLICERS)
+  echoln pokemon
+  echoln scene
+  echoln item
+
+
  is_supersplicer = isSuperSplicersMechanics(item)

  playingBGM = $game_system.getPlayingBGM
-  dexNumber = pokemon.species_data.id_number
-  if (pokemon.species_data.id_number <= NB_POKEMON)
-    if pokemon.fused != nil
-      if $player.party.length >= 6
-        scene.pbDisplay(_INTL("Your party is full! You can't unfuse {1}.", pokemon.name))
-        return false
-      else
-        $player.party[$player.party.length] = pokemon.fused
-        pokemon.fused = nil
-        pokemon.form = 0
-        scene.pbHardRefresh
-        scene.pbDisplay(_INTL("{1} changed Forme!", pokemon.name))
-        return true
-      end
-    else
+  if (pokemon.species_data.id_number <= Settings::NB_POKEMON)
      chosen = scene.pbChoosePokemon(_INTL("Fuse with which Pokémon?"))
      if chosen >= 0
        poke2 = $player.party[chosen]
-        if (poke2.species_data.id_number <= NB_POKEMON) && poke2 != pokemon
+        if (poke2.species_data.id_number <= Settings::NB_POKEMON) && poke2 != pokemon
          # check if fainted

          if pokemon.egg? || poke2.egg?
@@ -79,7 +70,7 @@ def pbDNASplicing(pokemon, scene, item = :DNASPLICERS)
      else
        return false
      end
-    end
+
  else
    # UNFUSE
    return true if pbUnfuse(pokemon, scene, is_supersplicer)
@@ -96,34 +87,10 @@ def selectFusion(pokemon, poke2, supersplicers = false)
  return selectedHead
 end

-# firstOptionSelected= selectedHead == pokemon
-# selectedBody = selectedHead == pokemon ? poke2 : pokemon
-# newid = (selectedBody.species_data.id_number) * NB_POKEMON + selectedHead.species_data.id_number
-
-# def pbFuse(pokemon, poke2, supersplicers = false)
-#   newid = (pokemon.species_data.id_number) * NB_POKEMON + poke2.species_data.id_number
-#   previewwindow = FusionPreviewScreen.new(pokemon, poke2)#PictureWindow.new(picturePath)
-#
-#   if (Kernel.pbConfirmMessage(_INTL("Fuse the two Pokémon?", newid)))
-#     previewwindow.dispose
-#     fus = PokemonFusionScene.new
-#     if (fus.pbStartScreen(pokemon, poke2, newid))
-#       returnItemsToBag(pokemon, poke2)
-#       fus.pbFusionScreen(false, supersplicers)
-#       $game_variables[126] += 1 #fuse counter
-#       fus.pbEndScreen
-#       return true
-#     end
-#   else
-#     previewwindow.dispose
-#     return false
-#   end
-# end
-
 def pbFuse(pokemon_body, pokemon_head, splicer_item)
  use_supersplicers_mechanics = isSuperSplicersMechanics(splicer_item)

-  newid = (pokemon_body.species_data.id_number) * NB_POKEMON + pokemon_head.species_data.id_number
+  newid = (pokemon_body.species_data.id_number) * Settings::NB_POKEMON + pokemon_head.species_data.id_number
  fus = PokemonFusionScene.new

  if (fus.pbStartScreen(pokemon_body, pokemon_head, newid, splicer_item))
@@ -137,7 +104,7 @@ end

 # Todo: refactor this, holy shit this is a mess
 def pbUnfuse(pokemon, scene, supersplicers, pcPosition = nil)
-  if pokemon.species_data.id_number > (NB_POKEMON * NB_POKEMON) + NB_POKEMON # triple fusion
+  if pokemon.species_data.id_number > (Settings::NB_POKEMON * Settings::NB_POKEMON) + Settings::NB_POKEMON # triple fusion
    scene.pbDisplay(_INTL("{1} cannot be unfused.", pokemon.name))
    return false
  end
--- a/Data/Scripts/998_InfiniteFusion/Fusion/Fusion
+++ b/Data/Scripts/998_InfiniteFusion/Fusion/Fusion
@@ -1,403 +1,421 @@
-# module GameData
-#   class FusedSpecies < GameData::Species
-#     attr_reader :growth_rate
-#     attr_reader :body_pokemon
-#     attr_reader :head_pokemon
-#
-#     def initialize(id)
-#       if id.is_a?(Integer)
-#         body_id = getBodyID(id)
-#         head_id = getHeadID(id, body_id)
-#         pokemon_id = getFusedPokemonIdFromDexNum(body_id, head_id)
-#         return GameData::FusedSpecies.new(pokemon_id)
-#       end
-#       head_id = get_head_number_from_symbol(id)
-#       body_id = get_body_number_from_symbol(id)
-#
-#       @body_pokemon = GameData::Species.get(body_id)
-#       @head_pokemon = GameData::Species.get(head_id)
-#
-#       @id = id
-#       @id_number = calculate_dex_number()
-#       @species = @id
-#       @form = 0
-#       @real_name = calculate_name()
-#       @real_form_name = nil
-#
-#       @type1 = calculate_type1()
-#       @type2 = calculate_type2()
-#
-#       #Stats
-#       @base_stats = calculate_base_stats()
-#       @evs = calculate_evs()
-#       adjust_stats_with_evs()
-#
-#       @base_exp = calculate_base_exp()
-#       @growth_rate = calculate_growth_rate()
-#       @gender_ratio = calculate_gender() #todo
-#       @catch_rate = calculate_catch_rate()
-#       @happiness = calculate_base_happiness()
-#
-#       #Moves
-#       @moves = calculate_moveset()
-#       @tutor_moves = calculate_tutor_moves() # hash[:tutor_moves] || []
-#       @egg_moves = calculate_egg_moves() # hash[:egg_moves] || []
-#
-#       #Abilities
-#       @abilities = calculate_abilities() # hash[:abilities] || []
-#       @hidden_abilities = calculate_hidden_abilities() # hash[:hidden_abilities] || []
-#
-#       #wild held items
-#       @wild_item_common = get_wild_item(@head_pokemon.wild_item_common, @body_pokemon.wild_item_common) # hash[:wild_item_common]
-#       @wild_item_uncommon = get_wild_item(@head_pokemon.wild_item_uncommon, @body_pokemon.wild_item_uncommon) # hash[:wild_item_uncommon]
-#       @wild_item_rare = get_wild_item(@head_pokemon.wild_item_rare, @body_pokemon.wild_item_rare) #  hash[:wild_item_rare]
-#
-#       @evolutions = calculate_evolutions() # hash[:evolutions] || []
-#
-#       #breeding
-#       @egg_groups = [:Undiscovered] #calculate_egg_groups() # hash[:egg_groups] || [:Undiscovered]
-#       @hatch_steps = calculate_hatch_steps() #  hash[:hatch_steps] || 1
-#       @incense = nil #hash[:incense]
-#
-#       #pokedex
-#       @pokedex_form = @form #ignored
-#       @real_category = calculate_category()
-#       @real_pokedex_entry = calculate_dex_entry()
-#       @height = average_values(@head_pokemon.height, @body_pokemon.height)
-#       @weight = average_values(@head_pokemon.weight, @body_pokemon.weight)
-#       @color = @head_pokemon.color
-#       @shape = @body_pokemon.shape
-#
-#       #sprite positioning
-#       @back_sprite_x = @body_pokemon.back_sprite_x
-#       @back_sprite_y = @body_pokemon.back_sprite_y
-#       @front_sprite_x = @body_pokemon.front_sprite_x
-#       @front_sprite_y = @body_pokemon.front_sprite_y
-#       @front_sprite_altitude = @body_pokemon.front_sprite_altitude
-#       @shadow_x = @body_pokemon.shadow_x
-#       @shadow_size = @body_pokemon.shadow_size
-#
-#       # #unused attributes from Species class
-#       #
-#       # @shape = :Head
-#       # @habitat = :None
-#       # @generation = 0
-#       # @mega_stone = nil
-#       # @mega_move = nil
-#       # @unmega_form = 0
-#       # @mega_message = 0
-#     end
-#
-#     def get_body_number_from_symbol(id)
-#       return id.to_s.match(/\d+/)[0].to_i
-#     end
-#
-#     def get_head_number_from_symbol(id)
-#       return id.to_s.match(/(?<=H)\d+/)[0].to_i
-#     end
-#
-#     def get_body_species
-#       return @body_pokemon.id_number
-#     end
-#
-#     def get_head_species
-#       return @head_pokemon.id_number
-#     end
-#
-#     def get_body_species_symbol
-#       return @body_pokemon.id
-#     end
-#
-#     def get_head_species_symbol
-#       return @head_pokemon.id
-#     end
-#
-#     def adjust_stats_with_evs
-#       GameData::Stat.each_main do |s|
-#         @base_stats[s.id] = 1 if !@base_stats[s.id] || @base_stats[s.id] <= 0
-#         @evs[s.id] = 0 if !@evs[s.id] || @evs[s.id] < 0
-#       end
-#     end
-#
-#     #FUSION CALCULATIONS
-#     def calculate_dex_number()
-#       return (@body_pokemon.id_number * NB_POKEMON) + @head_pokemon.id_number
-#     end
-#
-#     def calculate_type1()
-#       return @head_pokemon.type2 if @head_pokemon.type1 == :NORMAL && @head_pokemon.type2 == :FLYING
-#       return @head_pokemon.type1
-#     end
-#
-#     def calculate_type2()
-#       return @body_pokemon.type1 if @body_pokemon.type2 == @type1
-#       return @body_pokemon.type2
-#     end
-#
-#     def calculate_base_stats()
-#       head_stats = @head_pokemon.base_stats
-#       body_stats = @body_pokemon.base_stats
-#
-#       fused_stats = {}
-#
-#       #Head dominant stats
-#       fused_stats[:HP] = calculate_fused_stats(head_stats[:HP], body_stats[:HP])
-#       fused_stats[:SPECIAL_DEFENSE] = calculate_fused_stats(head_stats[:SPECIAL_DEFENSE], body_stats[:SPECIAL_DEFENSE])
-#       fused_stats[:SPECIAL_ATTACK] = calculate_fused_stats(head_stats[:SPECIAL_ATTACK], body_stats[:SPECIAL_ATTACK])
-#
-#       #Body dominant stats
-#       fused_stats[:ATTACK] = calculate_fused_stats(body_stats[:ATTACK], head_stats[:ATTACK])
-#       fused_stats[:DEFENSE] = calculate_fused_stats(body_stats[:DEFENSE], head_stats[:DEFENSE])
-#       fused_stats[:SPEED] = calculate_fused_stats(body_stats[:SPEED], head_stats[:SPEED])
-#
-#       return fused_stats
-#     end
-#
-#     def calculate_base_exp()
-#       head_exp = @head_pokemon.base_exp
-#       body_exp = @body_pokemon.base_exp
-#       return average_values(head_exp, body_exp)
-#     end
-#
-#     def calculate_catch_rate
-#       return get_lowest_value(@body_pokemon.catch_rate, @head_pokemon.catch_rate)
-#     end
-#
-#     def calculate_base_happiness
-#       return @head_pokemon.happiness
-#     end
-#
-#     def calculate_moveset
-#       return combine_arrays(@body_pokemon.moves, @head_pokemon.moves)
-#     end
-#
-#     def calculate_egg_moves
-#       return combine_arrays(@body_pokemon.egg_moves, @head_pokemon.egg_moves)
-#     end
-#
-#     def calculate_tutor_moves
-#       return combine_arrays(@body_pokemon.tutor_moves, @head_pokemon.tutor_moves)
-#     end
-#
-#     def get_wild_item(body_item, head_item)
-#       rand_num = rand(2)
-#       if rand_num == 0
-#         return body_item
-#       else
-#         return head_item
-#       end
-#     end
-#
-#     def calculate_abilities()
-#       abilities_hash = []
-#
-#       ability1 = @body_pokemon.abilities[0]
-#       ability2 = @head_pokemon.abilities[0]
-#       abilities_hash << ability1
-#       abilities_hash << ability2
-#       return abilities_hash
-#     end
-#
-#     # def calculate_abilities(pokemon1, pokemon2)
-#     #   abilities_hash = []
-#     #
-#     #   ability1 = pokemon1.abilities[0]
-#     #   ability2 = pokemon2.abilities[1]
-#     #   if !ability2
-#     #     ability2 = pokemon2.abilities[0]
-#     #   end
-#     #   abilities_hash << ability1
-#     #   abilities_hash << ability2
-#     #   return abilities_hash
-#     # end
-#
-#     def calculate_hidden_abilities()
-#       abilities_hash = []
-#
-#       #First two spots are the other abilities of the two pokemon
-#       ability1 = @body_pokemon.abilities[1]
-#       ability2 = @head_pokemon.abilities[1]
-#       ability1 = @body_pokemon.abilities[0] if !ability1
-#       ability2 = @head_pokemon.abilities[0] if !ability2
-#
-#       abilities_hash << ability1
-#       abilities_hash << ability2
-#
-#       #add the hidden ability for the two base pokemon
-#       hiddenAbility1 = @body_pokemon.hidden_abilities[0]
-#       hiddenAbility1 = ability1 if !hiddenAbility1
-#
-#       hiddenAbility2 = @head_pokemon.hidden_abilities[0]
-#       hiddenAbility2 = ability2 if !hiddenAbility2
-#
-#       abilities_hash << hiddenAbility1
-#       abilities_hash << hiddenAbility2
-#       return abilities_hash
-#     end
-#
-#     def calculate_name()
-#       body_nat_dex = GameData::NAT_DEX_MAPPING[@body_pokemon.id_number] ? GameData::NAT_DEX_MAPPING[@body_pokemon.id_number] : @body_pokemon.id_number
-#       head_nat_dex = GameData::NAT_DEX_MAPPING[@head_pokemon.id_number] ? GameData::NAT_DEX_MAPPING[@head_pokemon.id_number] : @head_pokemon.id_number
-#       begin
-#         prefix = GameData::SPLIT_NAMES[head_nat_dex][0]
-#         suffix = GameData::SPLIT_NAMES[body_nat_dex][1]
-#         if prefix[-1] == suffix[0]
-#           prefix = prefix[0..-2]
-#         end
-#         suffix = suffix.capitalize if prefix.end_with?(" ")
-#         return prefix + suffix
-#
-#       rescue
-#         print("species with error: " + @species.to_s)
-#       end
-#
-#     end
-#
-#     def calculate_evolutions()
-#       body_evolutions = @body_pokemon.evolutions
-#       head_evolutions = @head_pokemon.evolutions
-#
-#       fused_evolutions = []
-#
-#       #body
-#       for evolution in body_evolutions
-#         evolutionSpecies = evolution[0]
-#         evolutionSpecies_dex = GameData::Species.get(evolutionSpecies).id_number
-#         fused_species = _INTL("B{1}H{2}", evolutionSpecies_dex, @head_pokemon.id_number)
-#         fused_evolutions << build_evolution_array(evolution, fused_species)
-#       end
-#
-#       #head
-#       for evolution in head_evolutions
-#         evolutionSpecies = evolution[0]
-#         evolutionSpecies_dex = GameData::Species.get(evolutionSpecies).id_number
-#         fused_species = _INTL("B{1}H{2}", @body_pokemon.id_number, evolutionSpecies_dex)
-#         fused_evolutions << build_evolution_array(evolution, fused_species)
-#       end
-#
-#       return fused_evolutions
-#     end
-#
-#     #Change the evolution species depending if head & body and keep the rest of the data the same
-#     def build_evolution_array(evolution_data, new_species)
-#       fused_evolution_array = []
-#       fused_evolution_array << new_species.to_sym
-#
-#       #add the rest
-#       for data in evolution_data
-#         next if evolution_data.index(data) == 0
-#         fused_evolution_array << data
-#       end
-#       return fused_evolution_array
-#     end
-#
-#     def calculate_dex_entry
-#       body_entry = @body_pokemon.real_pokedex_entry.gsub(@body_pokemon.real_name, @real_name)
-#       head_entry = @head_pokemon.real_pokedex_entry.gsub(@head_pokemon.real_name, @real_name)
-#
-#       return split_and_combine_text(body_entry, head_entry, ".")
-#     end
-#
-#     def get_random_dex_entry()
-#       begin
-#         file_path = Settings::POKEDEX_ENTRIES_PATH
-#         json_data = File.read(file_path)
-#         all_body_entries  = HTTPLite::JSON.parse(json_data)
-#
-#
-#         body_entry = all_body_entries[@body_pokemon.id_number.to_s].sample
-#         body_entry = body_entry.gsub(/#{@body_pokemon.real_name}/i, @real_name)
-#         body_entry = clean_json_string(body_entry).gsub(@body_pokemon.real_name, @real_name)
-#
-#         head_entry = all_body_entries[@head_pokemon.id_number.to_s].sample
-#         head_entry = head_entry.gsub(/#{@head_pokemon.real_name}/i, @real_name)
-#         head_entry = clean_json_string(head_entry).gsub(@head_pokemon.real_name, @real_name)
-#       rescue
-#         body_entry = @body_pokemon.real_pokedex_entry.gsub(@body_pokemon.real_name, @real_name)
-#         head_entry = @head_pokemon.real_pokedex_entry.gsub(@head_pokemon.real_name, @real_name)
-#       end
-#       echoln body_entry
-#       echoln head_entry
-#       combined_entry = split_and_combine_text(body_entry, head_entry, ".")
-#       combined_entry += "." unless combined_entry.end_with?(".")
-#       return combined_entry
-#     end
-#
-#     def calculate_egg_groups
-#       body_egg_groups = @body_pokemon.egg_groups
-#       head_egg_groups = @head_pokemon.egg_groups
-#       return :Undiscovered if body_egg_groups.include?(:Undiscovered) || head_egg_groups.include?(:Undiscovered)
-#       return combine_arrays(body_egg_groups, head_egg_groups)
-#     end
-#
-#     def calculate_hatch_steps
-#       return average_values(@head_pokemon.hatch_steps, @body_pokemon.hatch_steps)
-#     end
-#
-#     def calculate_evs()
-#       return average_map_values(@body_pokemon.evs, @head_pokemon.evs)
-#     end
-#
-#     def calculate_category
-#       return split_and_combine_text(@body_pokemon.category, @head_pokemon.category, " ")
-#     end
-#
-#     def calculate_growth_rate
-#       growth_rate_priority = [:Fast, :Medium, :Parabolic, :Fluctuating, :Erratic, :Slow] #todo rearrange order for balance?
-#       body_growth_rate = @body_pokemon.growth_rate
-#       head_growth_rate = @head_pokemon.growth_rate
-#       base_growth_rates = [body_growth_rate, head_growth_rate]
-#       for rate in growth_rate_priority
-#         return rate if base_growth_rates.include?(rate)
-#       end
-#       return :Medium
-#     end
-#
-#     #TODO
-#     # ################## UNFINISHED ####################
-#     def calculate_gender
-#       return :Genderless
-#     end
-#
-#     #############################  UTIL METHODS ###############################
-#
-#     #Takes 2 strings, splits and combines them using the beginning of the first one and the end of the second one
-#     # (for example for pokedex entries)
-#     def split_and_combine_text(beginingText_full, endText_full, separator)
-#       beginingText_split = beginingText_full.split(separator, 2)
-#       endText_split = endText_full.split(separator, 2)
-#
-#       beginningText = beginingText_split[0]
-#       endText = endText_split[1] && endText_split[1] != "" ? endText_split[1] : endText_split[0]
-#       return beginningText + separator + " " + endText
-#     end
-#
-#     def calculate_fused_stats(dominantStat, otherStat)
-#       return ((2 * dominantStat) / 3) + (otherStat / 3).floor
-#     end
-#
-#     def average_values(value1, value2)
-#       return ((value1 + value2) / 2).floor
-#     end
-#
-#     def average_map_values(map1, map2)
-#       averaged_map = map1.merge(map2) do |key, value1, value2|
-#         ((value1 + value2) / 2.0).floor
-#       end
-#       return averaged_map
-#     end
-#
-#     def get_highest_value(value1, value2)
-#       return value1 > value2 ? value1 : value2
-#     end
-#
-#     def get_lowest_value(value1, value2)
-#       return value1 < value2 ? value1 : value2
-#     end
-#
-#     def combine_arrays(array1, array2)
-#       return array1 + array2
-#     end
-#
-#   end
-# end
+module GameData
+  class FusedSpecies < GameData::Species
+    attr_reader :growth_rate
+    attr_reader :body_pokemon
+    attr_reader :head_pokemon
+
+    def initialize(id)
+      if id.is_a?(Integer)
+        body_id = getBodyID(id)
+        head_id = getHeadID(id, body_id)
+        pokemon_id = getFusedPokemonIdFromDexNum(body_id, head_id)
+        return GameData::FusedSpecies.new(pokemon_id)
+      end
+      head_id = get_head_number_from_symbol(id)
+      body_id = get_body_number_from_symbol(id)
+
+      @body_pokemon = GameData::Species.get(body_id)
+      @head_pokemon = GameData::Species.get(head_id)
+
+      @id = id
+      @id_number = calculate_dex_number()
+      @species = @id
+      @form = 0
+      @real_name = calculate_name()
+      @real_form_name = nil
+
+      @type1 = calculate_type1()
+      @type2 = calculate_type2()
+      @types = [@type1, @type2]
+      #Stats
+      @base_stats = calculate_base_stats()
+      @evs = calculate_evs()
+      adjust_stats_with_evs()
+
+      @base_exp = calculate_base_exp()
+      @growth_rate = calculate_growth_rate()
+      @gender_ratio = calculate_gender() #todo
+      @catch_rate = calculate_catch_rate()
+      @happiness = calculate_base_happiness()
+
+      #Moves
+      @moves = calculate_moveset()
+      @tutor_moves = calculate_tutor_moves() # hash[:tutor_moves] || []
+      @egg_moves = calculate_egg_moves() # hash[:egg_moves] || []
+
+      #Abilities
+      @abilities = calculate_abilities() # hash[:abilities] || []
+      @hidden_abilities = calculate_hidden_abilities() # hash[:hidden_abilities] || []
+
+      #wild held items
+      @wild_item_common = get_wild_item(@head_pokemon.wild_item_common, @body_pokemon.wild_item_common) # hash[:wild_item_common]
+      @wild_item_uncommon = get_wild_item(@head_pokemon.wild_item_uncommon, @body_pokemon.wild_item_uncommon) # hash[:wild_item_uncommon]
+      @wild_item_rare = get_wild_item(@head_pokemon.wild_item_rare, @body_pokemon.wild_item_rare) #  hash[:wild_item_rare]
+
+      @evolutions = calculate_evolutions() # hash[:evolutions] || []
+
+      #breeding
+      @egg_groups = [:Undiscovered] #calculate_egg_groups() # hash[:egg_groups] || [:Undiscovered]
+      @hatch_steps = calculate_hatch_steps() #  hash[:hatch_steps] || 1
+      @incense = nil #hash[:incense]
+
+      #pokedex
+      @pokedex_form = @form #ignored
+      @real_category = calculate_category()
+      @real_pokedex_entry = calculate_dex_entry()
+      @height = average_values(@head_pokemon.height, @body_pokemon.height)
+      @weight = average_values(@head_pokemon.weight, @body_pokemon.weight)
+      @color = @head_pokemon.color
+      @shape = @body_pokemon.shape
+
+      #sprite positioning
+      #todo: this was moved to pokemon_metrics
+      # read the data for the body pokemon's species whenever it tries to position a fusedSpecies
+      #
+      # @back_sprite_x = @body_pokemon.back_sprite_x
+      # @back_sprite_y = @body_pokemon.back_sprite_y
+      # @front_sprite_x = @body_pokemon.front_sprite_x
+      # @front_sprite_y = @body_pokemon.front_sprite_y
+      # @front_sprite_altitude = @body_pokemon.front_sprite_altitude
+      # @shadow_x = @body_pokemon.shadow_x
+      # @shadow_size = @body_pokemon.shadow_size
+
+      # #unused attributes from Species class
+      #
+      # @shape = :Head
+      # @habitat = :None
+      # @generation = 0
+      # @mega_stone = nil
+      # @mega_move = nil
+      # @unmega_form = 0
+      # @mega_message = 0
+    end
+
+    def type1
+      return @type1
+    end
+
+    def type2
+      return @type2
+    end
+
+    def apply_metrics_to_sprite(sprite, index, shadow = false)
+      body_species = get_body_species()
+      metrics_data = GameData::SpeciesMetrics.get_species_form(body_species, 0)
+      metrics_data.apply_metrics_to_sprite(sprite, index, shadow)
+    end
+
+
+    def get_body_number_from_symbol(id)
+      return id.to_s.match(/\d+/)[0].to_i
+    end
+
+    def get_head_number_from_symbol(id)
+      return id.to_s.match(/(?<=H)\d+/)[0].to_i
+    end
+
+    def get_body_species
+      return @body_pokemon.id_number
+    end
+
+    def get_head_species
+      return @head_pokemon.id_number
+    end
+
+    def get_body_species_symbol
+      return @body_pokemon.id
+    end
+
+    def get_head_species_symbol
+      return @head_pokemon.id
+    end
+
+    def adjust_stats_with_evs
+      GameData::Stat.each_main do |s|
+        @base_stats[s.id] = 1 if !@base_stats[s.id] || @base_stats[s.id] <= 0
+        @evs[s.id] = 0 if !@evs[s.id] || @evs[s.id] < 0
+      end
+    end
+
+    #FUSION CALCULATIONS
+    def calculate_dex_number()
+      return (@body_pokemon.id_number * Settings::NB_POKEMON) + @head_pokemon.id_number
+    end
+
+    def calculate_type1()
+      return @head_pokemon.type2 if @head_pokemon.type1 == :NORMAL && @head_pokemon.type2 == :FLYING
+      return @head_pokemon.type1
+    end
+
+    def calculate_type2()
+      return @body_pokemon.type1 if @body_pokemon.type2 == @type1
+      return @body_pokemon.type2
+    end
+
+    def calculate_base_stats()
+      head_stats = @head_pokemon.base_stats
+      body_stats = @body_pokemon.base_stats
+
+      fused_stats = {}
+
+      #Head dominant stats
+      fused_stats[:HP] = calculate_fused_stats(head_stats[:HP], body_stats[:HP])
+      fused_stats[:SPECIAL_DEFENSE] = calculate_fused_stats(head_stats[:SPECIAL_DEFENSE], body_stats[:SPECIAL_DEFENSE])
+      fused_stats[:SPECIAL_ATTACK] = calculate_fused_stats(head_stats[:SPECIAL_ATTACK], body_stats[:SPECIAL_ATTACK])
+
+      #Body dominant stats
+      fused_stats[:ATTACK] = calculate_fused_stats(body_stats[:ATTACK], head_stats[:ATTACK])
+      fused_stats[:DEFENSE] = calculate_fused_stats(body_stats[:DEFENSE], head_stats[:DEFENSE])
+      fused_stats[:SPEED] = calculate_fused_stats(body_stats[:SPEED], head_stats[:SPEED])
+
+      return fused_stats
+    end
+
+    def calculate_base_exp()
+      head_exp = @head_pokemon.base_exp
+      body_exp = @body_pokemon.base_exp
+      return average_values(head_exp, body_exp)
+    end
+
+    def calculate_catch_rate
+      return get_lowest_value(@body_pokemon.catch_rate, @head_pokemon.catch_rate)
+    end
+
+    def calculate_base_happiness
+      return @head_pokemon.happiness
+    end
+
+    def calculate_moveset
+      return combine_arrays(@body_pokemon.moves, @head_pokemon.moves)
+    end
+
+    def calculate_egg_moves
+      return combine_arrays(@body_pokemon.egg_moves, @head_pokemon.egg_moves)
+    end
+
+    def calculate_tutor_moves
+      return combine_arrays(@body_pokemon.tutor_moves, @head_pokemon.tutor_moves)
+    end
+
+    def get_wild_item(body_item, head_item)
+      rand_num = rand(2)
+      if rand_num == 0
+        return body_item
+      else
+        return head_item
+      end
+    end
+
+    def calculate_abilities()
+      abilities_hash = []
+
+      ability1 = @body_pokemon.abilities[0]
+      ability2 = @head_pokemon.abilities[0]
+      abilities_hash << ability1
+      abilities_hash << ability2
+      return abilities_hash
+    end
+
+    # def calculate_abilities(pokemon1, pokemon2)
+    #   abilities_hash = []
+    #
+    #   ability1 = pokemon1.abilities[0]
+    #   ability2 = pokemon2.abilities[1]
+    #   if !ability2
+    #     ability2 = pokemon2.abilities[0]
+    #   end
+    #   abilities_hash << ability1
+    #   abilities_hash << ability2
+    #   return abilities_hash
+    # end
+
+    def calculate_hidden_abilities()
+      abilities_hash = []
+
+      #First two spots are the other abilities of the two pokemon
+      ability1 = @body_pokemon.abilities[1]
+      ability2 = @head_pokemon.abilities[1]
+      ability1 = @body_pokemon.abilities[0] if !ability1
+      ability2 = @head_pokemon.abilities[0] if !ability2
+
+      abilities_hash << ability1
+      abilities_hash << ability2
+
+      #add the hidden ability for the two base pokemon
+      hiddenAbility1 = @body_pokemon.hidden_abilities[0]
+      hiddenAbility1 = ability1 if !hiddenAbility1
+
+      hiddenAbility2 = @head_pokemon.hidden_abilities[0]
+      hiddenAbility2 = ability2 if !hiddenAbility2
+
+      abilities_hash << hiddenAbility1
+      abilities_hash << hiddenAbility2
+      return abilities_hash
+    end
+
+    def calculate_name()
+      body_nat_dex = GameData::NAT_DEX_MAPPING[@body_pokemon.id_number] ? GameData::NAT_DEX_MAPPING[@body_pokemon.id_number] : @body_pokemon.id_number
+      head_nat_dex = GameData::NAT_DEX_MAPPING[@head_pokemon.id_number] ? GameData::NAT_DEX_MAPPING[@head_pokemon.id_number] : @head_pokemon.id_number
+      begin
+        prefix = GameData::SPLIT_NAMES[head_nat_dex][0]
+        suffix = GameData::SPLIT_NAMES[body_nat_dex][1]
+        if prefix[-1] == suffix[0]
+          prefix = prefix[0..-2]
+        end
+        suffix = suffix.capitalize if prefix.end_with?(" ")
+        return prefix + suffix
+
+      rescue
+        print("species with error: " + @species.to_s)
+      end
+
+    end
+
+    def calculate_evolutions()
+      body_evolutions = @body_pokemon.evolutions
+      head_evolutions = @head_pokemon.evolutions
+
+      fused_evolutions = []
+
+      #body
+      for evolution in body_evolutions
+        evolutionSpecies = evolution[0]
+        evolutionSpecies_dex = GameData::Species.get(evolutionSpecies).id_number
+        fused_species = _INTL("B{1}H{2}", evolutionSpecies_dex, @head_pokemon.id_number)
+        fused_evolutions << build_evolution_array(evolution, fused_species)
+      end
+
+      #head
+      for evolution in head_evolutions
+        evolutionSpecies = evolution[0]
+        evolutionSpecies_dex = GameData::Species.get(evolutionSpecies).id_number
+        fused_species = _INTL("B{1}H{2}", @body_pokemon.id_number, evolutionSpecies_dex)
+        fused_evolutions << build_evolution_array(evolution, fused_species)
+      end
+
+      return fused_evolutions
+    end
+
+    #Change the evolution species depending if head & body and keep the rest of the data the same
+    def build_evolution_array(evolution_data, new_species)
+      fused_evolution_array = []
+      fused_evolution_array << new_species.to_sym
+
+      #add the rest
+      for data in evolution_data
+        next if evolution_data.index(data) == 0
+        fused_evolution_array << data
+      end
+      return fused_evolution_array
+    end
+
+    def calculate_dex_entry
+      body_entry = @body_pokemon.real_pokedex_entry.gsub(@body_pokemon.real_name, @real_name)
+      head_entry = @head_pokemon.real_pokedex_entry.gsub(@head_pokemon.real_name, @real_name)
+
+      return split_and_combine_text(body_entry, head_entry, ".")
+    end
+
+    def get_random_dex_entry()
+      begin
+        file_path = Settings::POKEDEX_ENTRIES_PATH
+        json_data = File.read(file_path)
+        all_body_entries  = HTTPLite::JSON.parse(json_data)
+
+
+        body_entry = all_body_entries[@body_pokemon.id_number.to_s].sample
+        body_entry = body_entry.gsub(/#{@body_pokemon.real_name}/i, @real_name)
+        body_entry = clean_json_string(body_entry).gsub(@body_pokemon.real_name, @real_name)
+
+        head_entry = all_body_entries[@head_pokemon.id_number.to_s].sample
+        head_entry = head_entry.gsub(/#{@head_pokemon.real_name}/i, @real_name)
+        head_entry = clean_json_string(head_entry).gsub(@head_pokemon.real_name, @real_name)
+      rescue
+        body_entry = @body_pokemon.real_pokedex_entry.gsub(@body_pokemon.real_name, @real_name)
+        head_entry = @head_pokemon.real_pokedex_entry.gsub(@head_pokemon.real_name, @real_name)
+      end
+      echoln body_entry
+      echoln head_entry
+      combined_entry = split_and_combine_text(body_entry, head_entry, ".")
+      combined_entry += "." unless combined_entry.end_with?(".")
+      return combined_entry
+    end
+
+    def calculate_egg_groups
+      body_egg_groups = @body_pokemon.egg_groups
+      head_egg_groups = @head_pokemon.egg_groups
+      return :Undiscovered if body_egg_groups.include?(:Undiscovered) || head_egg_groups.include?(:Undiscovered)
+      return combine_arrays(body_egg_groups, head_egg_groups)
+    end
+
+    def calculate_hatch_steps
+      return average_values(@head_pokemon.hatch_steps, @body_pokemon.hatch_steps)
+    end
+
+    def calculate_evs()
+      return average_map_values(@body_pokemon.evs, @head_pokemon.evs)
+    end
+
+    def calculate_category
+      return split_and_combine_text(@body_pokemon.category, @head_pokemon.category, " ")
+    end
+
+    def calculate_growth_rate
+      growth_rate_priority = [:Fast, :Medium, :Parabolic, :Fluctuating, :Erratic, :Slow] #todo rearrange order for balance?
+      body_growth_rate = @body_pokemon.growth_rate
+      head_growth_rate = @head_pokemon.growth_rate
+      base_growth_rates = [body_growth_rate, head_growth_rate]
+      for rate in growth_rate_priority
+        return rate if base_growth_rates.include?(rate)
+      end
+      return :Medium
+    end
+
+    #TODO
+    # ################## UNFINISHED ####################
+    def calculate_gender
+      return :Genderless
+    end
+
+    #############################  UTIL METHODS ###############################
+
+    #Takes 2 strings, splits and combines them using the beginning of the first one and the end of the second one
+    # (for example for pokedex entries)
+    def split_and_combine_text(beginingText_full, endText_full, separator)
+      beginingText_split = beginingText_full.split(separator, 2)
+      endText_split = endText_full.split(separator, 2)
+
+      beginningText = beginingText_split[0]
+      endText = endText_split[1] && endText_split[1] != "" ? endText_split[1] : endText_split[0]
+      return beginningText + separator + " " + endText
+    end
+
+    def calculate_fused_stats(dominantStat, otherStat)
+      return ((2 * dominantStat) / 3) + (otherStat / 3).floor
+    end
+
+    def average_values(value1, value2)
+      return ((value1 + value2) / 2).floor
+    end
+
+    def average_map_values(map1, map2)
+      averaged_map = map1.merge(map2) do |key, value1, value2|
+        ((value1 + value2) / 2.0).floor
+      end
+      return averaged_map
+    end
+
+    def get_highest_value(value1, value2)
+      return value1 > value2 ? value1 : value2
+    end
+
+    def get_lowest_value(value1, value2)
+      return value1 < value2 ? value1 : value2
+    end
+
+    def combine_arrays(array1, array2)
+      return array1 + array2
+    end
+
+  end
+end
--- a/Data/Scripts/998_InfiniteFusion/Fusion/Fusion
+++ b/Data/Scripts/998_InfiniteFusion/Fusion/Fusion
--- a/Data/Scripts/998_InfiniteFusion/Fusion/Fusion
+++ b/Data/Scripts/998_InfiniteFusion/Fusion/Fusion
@@ -1,31 +1,74 @@
-# module GameData
-#   module ClassMethods
-#     def get(other)
-#       validate other => [Symbol, self, String, Integer]
-#       return other if other.is_a?(self)
-#       other = other.to_sym if other.is_a?(String)
-#
-#       if other.to_s.match?(/\AB\d+H\d+\z/)
-#         species = GameData::FusedSpecies.new(other)
-#         return species
-#       end
-#
-#       if other.is_a?(Integer) && self == GameData::Species
-#         if other > NB_POKEMON
-#           body_id = getBodyID(other)
-#           head_id = getHeadID(other, body_id)
-#           pokemon_id = getFusedPokemonIdFromDexNum(body_id, head_id)
-#           return GameData::FusedSpecies.new(pokemon_id)
-#         end
-#       end
-#
-#       if !self::DATA.has_key?(other)
-#         # echoln _INTL("Unknown ID {1}.", other)
-#         return self::get(:PIKACHU)
-#       end
-#
-#       raise "Unknown ID #{other}." unless self::DATA.has_key?(other)
-#       return self::DATA[other]
-#     end
-#   end
-# end
+module GameData
+  module ClassMethods
+    def get(other)
+      validate other => [Symbol, self, String, Integer]
+      return other if other.is_a?(self)
+      other = other.to_sym if other.is_a?(String)
+
+      if other.to_s.match?(/\AB\d+H\d+\z/)
+        species = GameData::FusedSpecies.new(other)
+        return species
+      end
+
+      if other.is_a?(Integer) && self == GameData::Species
+        if other > Settings::NB_POKEMON
+          body_id = getBodyID(other)
+          head_id = getHeadID(other, body_id)
+          pokemon_id = getFusedPokemonIdFromDexNum(body_id, head_id)
+          return GameData::FusedSpecies.new(pokemon_id)
+        else
+          species_id = GameData::Species.keys[other-1]
+          return GameData::Species.get(species_id) if species_id
+        end
+      end
+
+      if !self::DATA.has_key?(other)
+        # echoln _INTL("Unknown ID {1}.", other)
+        return self::get(:PIKACHU)
+      end
+
+      raise "Unknown ID #{other}." unless self::DATA.has_key?(other)
+      return self::DATA[other]
+    end
+  end
+
+
+
+  module ClassMethodsSymbols
+    def get(other)
+      validate other => [Symbol, self, String, Integer]
+      return other if other.is_a?(self)
+      other = other.to_sym if other.is_a?(String)
+
+      if other.to_s.match?(/\AB\d+H\d+\z/)
+        species = GameData::FusedSpecies.new(other)
+        return species
+      end
+
+      if other.is_a?(Integer) && self == GameData::Species
+        if other > Settings::NB_POKEMON
+          body_id = getBodyID(other)
+          head_id = getHeadID(other, body_id)
+          pokemon_id = getFusedPokemonIdFromDexNum(body_id, head_id)
+          return GameData::FusedSpecies.new(pokemon_id)
+        else
+          species_id = GameData::Species.keys[other-1]
+          return GameData::Species.get(species_id) if species_id
+        end
+      end
+
+      raise "Unknown ID #{other}." unless self::DATA.has_key?(other)
+      return self::DATA[other]
+    end
+
+
+    def try_get(other)
+      return nil if other.nil?
+      validate other => [Symbol, self, String, Integer]
+      return other if other.is_a?(self)
+      other = other.to_sym if other.is_a?(String)
+      return (self::DATA.has_key?(other)) ? self::DATA[other] : nil
+    end
+
+  end
+end
--- a/Data/Scripts/998_InfiniteFusion/Fusion/FusionAnim.rb
+++ b/Data/Scripts/998_InfiniteFusion/Fusion/FusionAnim.rb
@@ -0,0 +1,38 @@
+# class PokemonFusionScene
+#   HEAD_SPRITE_STARTING_POS = Graphics.width / 2
+#
+#
+#   def pbStartScreen(pokemon_head,pokemon_body,pokemon_fused)
+#
+#     @pokemon_head = pokemon_head
+#     @pokemon_body = pokemon_body
+#
+#     @pokemon_fused = pokemon_fused
+#
+#     @sprites = {}
+#     @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
+#     @viewport.z = 99999
+#
+#     initialize_background()
+#     initialize_sprites()
+#   end
+#
+#   def initialize_background()
+#     addBackgroundOrColoredPlane(@sprites, "background", "DNAbg",
+#                                 Color.new(248, 248, 248), @viewport)
+#   end
+#
+#   def initialize_sprites()
+#     pokeHead_number = GameData::Species.get(@pokemon_head.species).id_number
+#     pokeBody_number = GameData::Species.get(@pokemon_body.species).id_number
+#
+#     @sprites["poke_head"] = PokemonSprite.new(@viewport)
+#     @sprites["poke_head"].setPokemonBitmapFromId(pokeHead_number, false, @pokemon_head.shiny?)
+#
+#     @sprites["poke_head"].ox = @sprites["rsprite1"].bitmap.width / 2
+#     @sprites["poke_head"].x = Graphics.width / 2
+#     @sprites["poke_head"].zoom_x = Settings::FRONTSPRITE_SCALE
+#
+#   end
+#
+# end
--- a/Data/Scripts/998_InfiniteFusion/Fusion/FusionMenu.rb
+++ b/Data/Scripts/998_InfiniteFusion/Fusion/FusionMenu.rb
@@ -0,0 +1,115 @@
+class FusionSelectOptionsScene < PokemonOption_Scene
+  attr_accessor :selectedAbility
+  attr_accessor :selectedNature
+  attr_accessor :hasNickname
+  attr_accessor :nickname
+
+
+  def initialize(abilityList,natureList, pokemon1, pokemon2)
+    @abilityList = abilityList
+    @natureList = natureList
+    @selectedAbility=nil
+    @selectedNature=nil
+    @selBaseColor = Color.new(48,96,216)
+    @selShadowColor = Color.new(32,32,32)
+    @show_frame=false
+    @hasNickname = false
+    @nickname = nil
+
+    @pokemon1=pokemon1
+    @pokemon2=pokemon2
+  end
+
+
+  def initUIElements
+    @sprites["title"] = Window_UnformattedTextPokemon.newWithSize(
+      _INTL("Select your Pokémon's ability and nature"), 0, 0, Graphics.width, 64, @viewport)
+    @sprites["textbox"] = pbCreateMessageWindow
+    @sprites["textbox"].letterbyletter = false
+    pbSetSystemFont(@sprites["textbox"].contents)
+    @sprites["title"].opacity=0
+  end
+
+  def pbStartScene(inloadscreen = nil)
+    super
+    @sprites["option"].opacity=0
+  end
+
+
+  def getAbilityName(ability)
+    return GameData::Ability.get(ability.id).real_name
+  end
+
+  def getAbilityDescription(ability)
+    return GameData::Ability.get(ability.id).real_description
+  end
+
+  def getNatureName(nature)
+    return GameData::Nature.get(nature.id).real_name
+  end
+
+  def getNatureDescription(nature)
+    change= GameData::Nature.get(nature.id).stat_changes
+    return "Neutral nature" if change.empty?
+    positiveChange = change[0]
+    negativeChange = change[1]
+    return _INTL("+ {1}\n- {2}",GameData::Stat.get(positiveChange[0]).name,GameData::Stat.get(negativeChange[0]).name)
+  end
+
+  def shouldSelectNickname
+    if @pokemon1.nicknamed? && @pokemon2.nicknamed?
+      @hasNickname=true
+      return true
+    end
+    if @pokemon1.nicknamed? && !@pokemon2.nicknamed?
+      @hasNickname=true
+      @nickname = @pokemon1.name
+      return false
+    end
+    if !@pokemon1.nicknamed? && @pokemon2.nicknamed?
+      @hasNickname=true
+      @nickname = @pokemon2.name
+      return false
+    end
+    @hasNickname=false
+    return false
+  end
+
+  def pbGetOptions(inloadscreen = false)
+
+    options = []
+    if shouldSelectNickname
+      options << EnumOption.new(_INTL("Nickname"), [_INTL(@pokemon1.name), _INTL(@pokemon2.name)],
+                                proc { 0 },
+                                proc { |value|
+                                  if value ==0
+                                    @nickname = @pokemon1.name
+                                  else
+                                    @nickname = @pokemon2.name
+                                  end
+                                }, "Select the Pokémon's nickname")
+    end
+
+    options << EnumOption.new(_INTL("Ability"), [_INTL(getAbilityName(@abilityList[0])), _INTL(getAbilityName(@abilityList[1]))],
+                     proc { 0 },
+                     proc { |value|
+                       @selectedAbility=@abilityList[value]
+                     }, [getAbilityDescription(@abilityList[0]), getAbilityDescription(@abilityList[1])]
+      )
+
+    options << EnumOption.new(_INTL("Nature"), [_INTL(getNatureName(@natureList[0])), _INTL(getNatureName(@natureList[1]))],
+                     proc { 0 },
+                     proc { |value|
+                       @selectedNature=@natureList[value]
+                     }, [getNatureDescription(@natureList[0]), getNatureDescription(@natureList[1])]
+      )
+    return options
+  end
+
+
+  def isConfirmedOnKeyPress
+    return true
+  end
+
+end
+
--- a/Data/Scripts/998_InfiniteFusion/Fusion/FusionPreviewScreen.rb
+++ b/Data/Scripts/998_InfiniteFusion/Fusion/FusionPreviewScreen.rb
@@ -0,0 +1,39 @@
+class FusionPreviewScreen < DoublePreviewScreen
+  attr_reader :poke1
+  attr_reader :poke2
+  attr_reader :fusedPokemon
+  attr_reader :fusedPokemon
+
+  attr_writer :draw_types
+  attr_writer :draw_level
+
+  BACKGROUND_PATH = "Graphics/Pictures/DNAbg"
+
+
+  def initialize(poke1,poke2, usingSuperSplicers=false)
+    super(poke1,poke2)
+    @draw_types = true
+    @draw_level = true
+    @draw_sprite_info=true
+
+    #@viewport = viewport
+    @poke1 = poke1
+    @poke2 = poke2
+    @fusedPokemon=nil
+    new_level = calculateFusedPokemonLevel(poke1.level, poke2.level, usingSuperSplicers)
+
+    fusion_left = (poke1.species_data.id_number) * Settings::NB_POKEMON + poke2.species_data.id_number
+    fusion_right = (poke2.species_data.id_number) * Settings::NB_POKEMON + poke1.species_data.id_number
+
+    @picture1 = draw_window(fusion_left,new_level,20,30)
+    @picture2 = draw_window(fusion_right,new_level,270,30)
+
+    @sprites["picture1"] = @picture1
+    @sprites["picture2"] = @picture2
+
+  end
+
+  def getBackgroundPicture
+    super
+  end
+end
--- a/Data/Scripts/998_InfiniteFusion/Fusion/PokemonFusion.rb
+++ b/Data/Scripts/998_InfiniteFusion/Fusion/PokemonFusion.rb
--- a/Data/Scripts/998_InfiniteFusion/Fusion/fusion_utils.rb
+++ b/Data/Scripts/998_InfiniteFusion/Fusion/fusion_utils.rb
@@ -38,14 +38,14 @@ end

 def species_is_fusion(species_id)
  dex_number = get_dex_number(species_id)
-  return dex_number > NB_POKEMON && dex_number < Settings::ZAPMOLCUNO_NB
+  return dex_number > Settings::NB_POKEMON && dex_number < Settings::ZAPMOLCUNO_NB
 end

 def get_dex_number(species_id)
  return GameData::Species.get(species_id).id_number
 end

-def getBodyID(species, nb_pokemon = NB_POKEMON)
+def getBodyID(species, nb_pokemon = Settings::NB_POKEMON)
  if species.is_a?(Integer)
    dexNum = species
  else
@@ -57,7 +57,7 @@ def getBodyID(species, nb_pokemon = NB_POKEMON)
  return (dexNum / nb_pokemon).round
 end

-def getHeadID(species, bodyId = nil, nb_pokemon = NB_POKEMON)
+def getHeadID(species, bodyId = nil, nb_pokemon = Settings::NB_POKEMON)
  if species.is_a?(Integer)
    fused_dexNum = species
  else
@@ -408,3 +408,13 @@ def get_triple_fusion_components(species_id)

 end

+def reverseFusionSpecies(species)
+  dexId = getDexNumberForSpecies(species)
+  return species if dexId <= NB_POKEMON
+  return species if dexId > (NB_POKEMON * NB_POKEMON) + NB_POKEMON
+  body = getBasePokemonID(dexId, true)
+  head = getBasePokemonID(dexId, false)
+  newspecies = (head) * NB_POKEMON + body
+  return getPokemon(newspecies)
+end
+
--- a/Data/Scripts/998_InfiniteFusion/Gameplay/Utils/GameplayUtils.rb
+++ b/Data/Scripts/998_InfiniteFusion/Gameplay/Utils/GameplayUtils.rb
@@ -564,4 +564,26 @@ end

 def isOnPinkanIsland()
  return false
+end
+
+def generateSimpleTrainerParty(teamSpecies, level)
+  team = []
+  for species in teamSpecies
+    poke = Pokemon.new(species, level)
+    team << poke
+  end
+  return team
+end
+
+def generateEggGroupTeam(eggGroup)
+  teamComplete = false
+  generatedTeam = []
+  while !teamComplete
+    species = rand(PBSpecies.maxValue)
+    if getPokemonEggGroups(species).include?(eggGroup)
+      generatedTeam << species
+    end
+    teamComplete = generatedTeam.length == 3
+  end
+  return generatedTeam
 end
--- a/Data/Scripts/998_InfiniteFusion/Gameplay/Utils/GraphicsUtils.rb
+++ b/Data/Scripts/998_InfiniteFusion/Gameplay/Utils/GraphicsUtils.rb
@@ -46,4 +46,58 @@ end
 def playAnimation(animationId, x, y)
  return if !$scene.is_a?(Scene_Map)
  $scene.spriteset.addUserAnimation(animationId, x, y, true)
+end
+
+def get_spritecharacter_for_event(event_id)
+  for sprite in $scene.spriteset.character_sprites
+    if sprite.character.id == event_id
+      return sprite
+    end
+  end
+end
+
+def pbBitmap(path)
+  if !pbResolveBitmap(path).nil?
+    bmp = RPG::Cache.load_bitmap_path(path)
+    bmp.storedPath = path
+  else
+    p "Image located at '#{path}' was not found!" if $DEBUG
+    bmp = Bitmap.new(1, 1)
+  end
+  return bmp
+end
+
+def addShinyStarsToGraphicsArray(imageArray, xPos, yPos, shinyBody, shinyHead, debugShiny, srcx = nil, srcy = nil, width = nil, height = nil,
+                                 showSecondStarUnder = false, showSecondStarAbove = false)
+  color = debugShiny ? Color.new(0, 0, 0, 255) : nil
+  imageArray.push(["Graphics/Pictures/shiny", xPos, yPos, srcx, srcy, width, height, color])
+  if shinyBody && shinyHead
+    if showSecondStarUnder
+      yPos += 15
+    elsif showSecondStarAbove
+      yPos -= 15
+    else
+      xPos -= 15
+    end
+    imageArray.push(["Graphics/Pictures/shiny", xPos, yPos, srcx, srcy, width, height, color])
+  end
+end
+
+def pbCheckPokemonIconFiles(speciesID, egg = false, dna = false)
+  if egg
+    bitmapFileName = sprintf("Graphics/Icons/iconEgg")
+    return pbResolveBitmap(bitmapFileName)
+  else
+    bitmapFileName = _INTL("Graphics/Pokemon/Icons/{1}", speciesID)
+    ret = pbResolveBitmap(bitmapFileName)
+    return ret if ret
+  end
+  ret = pbResolveBitmap("Graphics/Icons/iconDNA.png")
+  return ret if ret
+  return pbResolveBitmap("Graphics/Icons/iconDNA.png")
+end
+
+def pbPokemonIconFile(pokemon)
+  bitmapFileName = pbCheckPokemonIconFiles(pokemon.species, pokemon.isEgg?)
+  return bitmapFileName
 end
--- a/Data/Scripts/998_InfiniteFusion/Gameplay/Utils/MenuUtils.rb
+++ b/Data/Scripts/998_InfiniteFusion/Gameplay/Utils/MenuUtils.rb
@@ -164,4 +164,17 @@ def swapReleaseCaughtPokemon(caughtPokemon)
  $player.party[index] = $player.party[-1]
  $player.party[-1] = tmp
  return true
+end
+
+def Kernel.getItemNamesAsString(list)
+  strList = ""
+  for i in 0..list.length - 1
+    id = list[i]
+    name = PBItems.getName(id)
+    strList += name
+    if i != list.length - 1 && list.length > 1
+      strList += ","
+    end
+  end
+  return strList
 end
--- a/Data/Scripts/998_InfiniteFusion/Gameplay/Utils/PlayerUtils.rb
+++ b/Data/Scripts/998_InfiniteFusion/Gameplay/Utils/PlayerUtils.rb
@@ -6,3 +6,5 @@ def isPlayerFemale()
  return pbGet(VAR_TRAINER_GENDER) == GENDER_FEMALE
 end# frozen_string_literal: true

+
+
--- a/Data/Scripts/998_InfiniteFusion/Gameplay/Utils/PokemonUtils.rb
+++ b/Data/Scripts/998_InfiniteFusion/Gameplay/Utils/PokemonUtils.rb
@@ -244,4 +244,272 @@ def oricorioEventPickFlower(flower_color)
    pbMessage(_INTL("{1} picked some of the blue flowers.", $player.name))
  end

+end
+
+# frozen_string_literal: true
+
+def isInKantoGeneration(dexNumber)
+  return dexNumber <= 151
+end
+
+def isKantoPokemon(species)
+  dexNum = getDexNumberForSpecies(species)
+  poke = getPokemon(species)
+  head_dex = getDexNumberForSpecies(poke.get_head_species())
+  body_dex = getDexNumberForSpecies(poke.get_body_species())
+  return isInKantoGeneration(dexNum) || isInKantoGeneration(head_dex) || isInKantoGeneration(body_dex)
+end
+
+def isInJohtoGeneration(dexNumber)
+  return dexNumber > 151 && dexNumber <= 251
+end
+
+def isJohtoPokemon(species)
+  dexNum = getDexNumberForSpecies(species)
+  poke = getPokemon(species)
+  head_dex = getDexNumberForSpecies(poke.get_head_species())
+  body_dex = getDexNumberForSpecies(poke.get_body_species())
+  return isInJohtoGeneration(dexNum) || isInJohtoGeneration(head_dex) || isInJohtoGeneration(body_dex)
+end
+
+def isAlolaPokemon(species)
+  dexNum = getDexNumberForSpecies(species)
+  poke = getPokemon(species)
+  head_dex = getDexNumberForSpecies(poke.get_head_species())
+  body_dex = getDexNumberForSpecies(poke.get_body_species())
+  list = [
+    370, 373, 430, 431, 432, 433, 450, 451, 452,
+    453, 454, 455, 459, 460, 463, 464, 465, 469, 470,
+    471, 472, 473, 474, 475, 476, 477, 498, 499,
+  ]
+  return list.include?(dexNum) || list.include?(head_dex) || list.include?(body_dex)
+end
+
+def isKalosPokemon(species)
+  dexNum = getDexNumberForSpecies(species)
+  poke = getPokemon(species)
+  head_dex = getDexNumberForSpecies(poke.get_head_species())
+  body_dex = getDexNumberForSpecies(poke.get_body_species())
+  list =
+    [327, 328, 329, 339, 371, 372, 417, 418,
+     425, 426, 438, 439, 440, 441, 444, 445, 446,
+     456, 461, 462, 478, 479, 480, 481, 482, 483, 484, 485, 486, 487,
+     489, 490, 491, 492, 500,
+
+    ]
+  return list.include?(dexNum) || list.include?(head_dex) || list.include?(body_dex)
+end
+
+def isUnovaPokemon(species)
+  dexNum = getDexNumberForSpecies(species)
+  poke = getPokemon(species)
+  head_dex = getDexNumberForSpecies(poke.get_head_species())
+  body_dex = getDexNumberForSpecies(poke.get_body_species())
+  list =
+    [
+      330, 331, 337, 338, 348, 349, 350, 351, 359, 360, 361,
+      362, 363, 364, 365, 366, 367, 368, 369, 374, 375, 376, 377,
+      397, 398, 399, 406, 407, 408, 409, 410, 411, 412, 413, 414,
+      415, 416, 419, 420,
+      422, 423, 424, 434, 345,
+      466, 467, 494, 493,
+    ]
+  return list.include?(dexNum) || list.include?(head_dex) || list.include?(body_dex)
+end
+
+def isSinnohPokemon(species)
+  dexNum = getDexNumberForSpecies(species)
+  poke = getPokemon(species)
+  head_dex = getDexNumberForSpecies(poke.get_head_species())
+  body_dex = getDexNumberForSpecies(poke.get_body_species())
+  list =
+    [254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265,
+     266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 288, 294,
+     295, 296, 297, 298, 299, 305, 306, 307, 308, 315, 316, 317,
+     318, 319, 320, 321, 322, 323, 324, 326, 332, 343, 344, 345,
+     346, 347, 352, 353, 354, 358, 383, 384, 388, 389, 400, 402,
+     403, 429, 468]
+
+  return list.include?(dexNum) || list.include?(head_dex) || list.include?(body_dex)
+end
+
+def isHoennPokemon(species)
+  dexNum = getDexNumberForSpecies(species)
+  poke = getPokemon(species)
+  head_dex = getDexNumberForSpecies(poke.get_head_species())
+  body_dex = getDexNumberForSpecies(poke.get_body_species())
+  list = [252, 253, 276, 277, 278, 279, 280, 281, 282, 283, 284,
+          285, 286, 287, 289, 290, 291, 292, 293, 300, 301, 302, 303,
+          304, 309, 310, 311, 312, 313, 314, 333, 334, 335, 336, 340,
+          341, 342, 355, 356, 357, 378, 379, 380, 381, 382, 385, 386,
+          387, 390, 391, 392, 393, 394, 395, 396, 401, 404, 405, 421,
+          427, 428, 436, 437, 442, 443, 447, 448, 449, 457, 458, 488,
+          495, 496, 497, 501, 502, 503, 504, 505, 506, 507, 508, 509,
+          510, 511, 512, 513, 514, 515, 516, 517, 518, 519, 520, 521,
+          522, 523, 524, 525, 526, 527, 528, 529, 530, 531, 532, 533,
+          534, 535, 536, 537, 538, 539, 540, 541, 542, 543, 544, 545,
+          546, 547, 548, 549, 550, 551, 552, 553, 554, 555, 556, 557,
+          558, 559, 560, 561, 562, 563, 564, 565
+  ]
+  return list.include?(dexNum) || list.include?(head_dex) || list.include?(body_dex)
+end
+
+def Kernel.getRoamingMap(roamingArrayPos)
+  curmap = $PokemonGlobal.roamPosition[roamingArrayPos]
+  mapinfos = $RPGVX ? load_data("Data/MapInfos.rvdata") : load_data("Data/MapInfos.rxdata")
+  text = mapinfos[curmap].name #,(curmap==$game_map.map_id) ? _INTL("(this map)") : "")
+  return text
+end
+
+def get_default_moves_at_level(species, level)
+  moveset = GameData::Species.get(species).moves
+  knowable_moves = []
+  moveset.each { |m| knowable_moves.push(m[1]) if m[0] <= level }
+  # Remove duplicates (retaining the latest copy of each move)
+  knowable_moves = knowable_moves.reverse
+  knowable_moves |= []
+  knowable_moves = knowable_moves.reverse
+  # Add all moves
+  moves = []
+  first_move_index = knowable_moves.length - MAX_MOVES
+  first_move_index = 0 if first_move_index < 0
+  for i in first_move_index...knowable_moves.length
+    #moves.push(Pokemon::Move.new(knowable_moves[i]))
+    moves << knowable_moves[i]
+  end
+  return moves
+end
+
+def listPokemonIDs()
+  for id in 0..Settings::NB_POKEMON
+    pokemon = GameData::Species.get(id).species
+    echoln id.to_s + ": " + "\"" + pokemon.to_s + "\"" + ", "
+  end
+end
+
+def getAllNonLegendaryPokemon()
+  list = []
+  for i in 1..143
+    list.push(i)
+  end
+  for i in 147..149
+    list.push(i)
+  end
+  for i in 152..242
+    list.push(i)
+  end
+  list.push(246)
+  list.push(247)
+  list.push(248)
+  for i in 252..314
+    list.push(i)
+  end
+  for i in 316..339
+    list.push(i)
+  end
+  for i in 352..377
+    list.push(i)
+  end
+  for i in 382..420
+    list.push(i)
+  end
+  return list
+end
+
+def getPokemonEggGroups(species)
+  return GameData::Species.get(species).egg_groups
+end
+
+def getAbilityIndexFromID(abilityID, fusedPokemon)
+  abilityList = fusedPokemon.getAbilityList
+  for abilityArray in abilityList #ex: [:CHLOROPHYLL, 0]
+    ability = abilityArray[0]
+    index = abilityArray[1]
+    return index if ability == abilityID
+  end
+  return 0
+end
+
+def getSpecies(dexnum)
+  return getPokemon(dexnum.species) if dexnum.is_a?(Pokemon)
+  return getPokemon(dexnum)
+end
+
+def getPokemon(dexNum)
+  if dexNum.is_a?(Integer)
+    if dexNum > Settings::NB_POKEMON
+      body_id = getBodyID(dexNum)
+      head_id = getHeadID(dexNum, body_id)
+      pokemon_id = getFusedPokemonIdFromDexNum(body_id, head_id)
+    else
+      pokemon_id = dexNum
+    end
+  else
+    pokemon_id = dexNum
+  end
+
+  return GameData::Species.get(pokemon_id)
+end
+
+def CanLearnMove(pokemon, move)
+  species = getID(PBSpecies, pokemon)
+  return false if species <= 0
+  data = load_data("Data/tm.dat")
+  return false if !data[move]
+  return data[move].any? { |item| item == species }
+end
+
+def getID(pbspecies_unused, species)
+  if species.is_a?(String)
+    return nil
+  elsif species.is_a?(Symbol)
+    return GameData::Species.get(species).id_number
+  elsif species.is_a?(Pokemon)
+    id = species.dexNum
+  end
+end
+
+def pbAddPokemonID(pokemon_id, level = 1, see_form = true, skip_randomize = false)
+  return false if !pokemon_id
+  skip_randomize = true if $game_switches[SWITCH_CHOOSING_STARTER] #when choosing starters
+  if pbBoxesFull?
+    pbMessage(_INTL("There's no more room for Pokémon!\1"))
+    pbMessage(_INTL("The Pokémon Boxes are full and can't accept any more!"))
+    return false
+  end
+  if pokemon_id.is_a?(Integer) && level.is_a?(Integer)
+    pokemon = Pokemon.new(pokemon_id, level)
+    species_name = pokemon.speciesName
+  end
+
+  #random species if randomized gift pokemon &  wild poke
+  if $game_switches[SWITCH_RANDOM_GIFT_POKEMON] && $game_switches[SWITCH_RANDOM_WILD] && !skip_randomize
+    tryRandomizeGiftPokemon(pokemon, skip_randomize)
+  end
+
+  pbMessage(_INTL("{1} obtained {2}!\\me[Pkmn get]\\wtnp[80]\1", $Trainer.name, species_name))
+  pbNicknameAndStore(pokemon)
+  $Trainer.pokedex.register(pokemon) if see_form
+  return true
+end
+
+def pbHasSpecies?(species)
+  if species.is_a?(String) || species.is_a?(Symbol)
+    id = getID(PBSpecies, species)
+  elsif species.is_a?(Pokemon)
+    id = species.dexNum
+  end
+  for pokemon in $Trainer.party
+    next if pokemon.isEgg?
+    return true if pokemon.dexNum == id
+  end
+  return false
+end
+
+def pbPlayCry(pkmn, volume = 90, pitch = nil)
+  GameData::Species.play_cry(pkmn, volume, pitch)
+end
+
+def pbCryFrameLength(species, form = 0, pitch = 100)
+  return GameData::Species.cry_length(species, form, pitch)
 end
--- a/Data/Scripts/998_InfiniteFusion/Gameplay/Utils/SpritesUtils.rb
+++ b/Data/Scripts/998_InfiniteFusion/Gameplay/Utils/SpritesUtils.rb
@@ -3,5 +3,5 @@
 # setForcedAltSprites(forced_sprites)
 #
 def setForcedAltSprites(forcedSprites_map)
-  $PokemonTemp.forced_alt_sprites = forcedSprites_map
+  $game_temp.forced_alt_sprites = forcedSprites_map
 end
--- a/Data/Scripts/998_InfiniteFusion/Gameplay/Utils/SystemUtils.rb
+++ b/Data/Scripts/998_InfiniteFusion/Gameplay/Utils/SystemUtils.rb
@@ -142,4 +142,69 @@ def change_game_difficulty(down_only = false)

  message = "The game is currently on " + get_difficulty_text() + " difficulty."
  pbMessage(message)
+end
+
+def find_newer_available_version
+  latest_Version = fetch_latest_game_version
+  return nil if !latest_Version
+  return nil if is_higher_version(Settings::GAME_VERSION_NUMBER, latest_Version)
+  return latest_Version
+end
+
+def is_higher_version(gameVersion, latestVersion)
+  gameVersion_parts = gameVersion.split('.').map(&:to_i)
+  latestVersion_parts = latestVersion.split('.').map(&:to_i)
+
+  # Compare each part of the version numbers from left to right
+  gameVersion_parts.each_with_index do |part, i|
+    return true if (latestVersion_parts[i].nil? || part > latestVersion_parts[i])
+    return false if part < latestVersion_parts[i]
+  end
+  return latestVersion_parts.length <= gameVersion_parts.length
+end
+
+def get_current_game_difficulty
+  return :EASY if $game_switches[SWITCH_GAME_DIFFICULTY_EASY]
+  return :HARD if $game_switches[SWITCH_GAME_DIFFICULTY_HARD]
+  return :NORMAL
+end
+
+def get_difficulty_text
+  if $game_switches[SWITCH_GAME_DIFFICULTY_EASY]
+    return "Easy"
+  elsif $game_switches[SWITCH_GAME_DIFFICULTY_HARD]
+    return "Hard"
+  else
+    return "Normal"
+  end
+end
+
+def getCurrentLevelCap()
+  current_max_level = Settings::LEVEL_CAPS[$Trainer.badge_count]
+  current_max_level *= Settings::HARD_MODE_LEVEL_MODIFIER if $game_switches[SWITCH_GAME_DIFFICULTY_HARD]
+  return current_max_level
+end
+
+def pokemonExceedsLevelCap(pokemon)
+  return false if $Trainer.badge_count >= Settings::NB_BADGES
+  current_max_level = getCurrentLevelCap()
+  return pokemon.level >= current_max_level
+end
+
+def getLatestSpritepackDate()
+  return Time.new(Settings::NEWEST_SPRITEPACK_YEAR, Settings::NEWEST_SPRITEPACK_MONTH)
+end
+
+def new_spritepack_was_released()
+  current_spritepack_date = $PokemonGlobal.current_spritepack_date
+  latest_spritepack_date = getLatestSpritepackDate()
+  if !current_spritepack_date || (current_spritepack_date < latest_spritepack_date)
+    $PokemonGlobal.current_spritepack_date = latest_spritepack_date
+    return true
+  end
+  return false
+end
+
+def pbGetSelfSwitch(eventId, switch)
+  return $game_self_switches[[@map_id, eventId, switch]]
 end
--- a/Data/Scripts/998_InfiniteFusion/Graphics/Tilemaps/PIF_TilemapRenderer.rb
+++ b/Data/Scripts/998_InfiniteFusion/Graphics/Tilemaps/PIF_TilemapRenderer.rb
@@ -7,6 +7,9 @@ class TilemapRenderer


  #   Examples:
+  #
+  #   Normal tile IDs start at 384
+  #
  #    1 => [["Sand shore"], ["Flowers2"]],
  #    2 => [[], ["Flowers2", "Waterfall", "Waterfall crest", "Waterfall bottom"]],
  #    6 => [["Water rock", "Sea deep"], []]
@@ -30,7 +33,11 @@ class TilemapRenderer
            1023 => "flowers_red[10]",
            1031 => "flowers_grey[10]",
            1039 => "flowers_white[10]",
-    }
+    },
+    3 => {  #interior
+          385 => "tv_flicker_left",
+
+  }
  }

  def add_extra_autotiles(tileset_id)
--- a/Data/Scripts/998_InfiniteFusion/InfiniteFusionSettings.rb
+++ b/Data/Scripts/998_InfiniteFusion/InfiniteFusionSettings.rb
@@ -23,7 +23,7 @@ module Settings
  FUSION_ICON_SPRITE_OFFSET = 10

  #Infinite fusion settings
-  NB_POKEMON = 501
+  NB_POKEMON = 565
  CUSTOM_BASE_SPRITES_FOLDER = "Graphics/CustomBattlers/local_sprites/BaseSprites/"
  CUSTOM_BATTLERS_FOLDER = "Graphics/CustomBattlers/"
  CUSTOM_SPRITES_TO_IMPORT_FOLDER = "Graphics/CustomBattlers/Sprites to import/"
--- a/Data/Scripts/998_InfiniteFusion/Items/New
+++ b/Data/Scripts/998_InfiniteFusion/Items/New
@@ -114,79 +114,9 @@ ItemHandlers::UseFromBag.add(:LANTERN, proc { |item|
  next true
 })

-ItemHandlers::UseOnPokemon.add(:TRANSGENDERSTONE, proc { |item, pokemon, scene|
-  if pokemon.gender == 0
-    pokemon.makeFemale
-    scene.pbRefresh
-    scene.pbDisplay(_INTL("The Pokémon became female!"))
-    next true
-  elsif pokemon.gender == 1
-    pokemon.makeMale
-    scene.pbRefresh
-    scene.pbDisplay(_INTL("The Pokémon became male!"))

-    next true
-  else
-    scene.pbDisplay(_INTL("It won't have any effect."))
-    next false
-  end
-})

-# NOT FULLY IMPLEMENTED
-ItemHandlers::UseOnPokemon.add(:SECRETCAPSULE, proc { |item, poke, scene|
-  abilityList = poke.getAbilityList
-  numAbilities = abilityList[0].length
-
-  if numAbilities <= 2
-    scene.pbDisplay(_INTL("It won't have any effect."))
-    next false
-  elsif abilityList[0].length <= 3
-    if changeHiddenAbility1(abilityList, scene, poke)
-      next true
-    end
-    next false
-  else
-    if changeHiddenAbility2(abilityList, scene, poke)
-      next true
-    end
-    next false
-  end
-})
-
-def changeHiddenAbility1(abilityList, scene, poke)
-  abID1 = abilityList[0][2]
-  msg = _INTL("Change {1}'s ability to {2}?", poke.name, PBAbilities.getName(abID1))
-  if Kernel.pbConfirmMessage(_INTL(msg))
-    poke.setAbility(2)
-    abilName1 = PBAbilities.getName(abID1)
-    scene.pbDisplay(_INTL("{1}'s ability was changed to {2}!", poke.name, PBAbilities.getName(abID1)))
-    return true
-  else
-    return false
-  end
-end
-
-def changeHiddenAbility2(abilityList, scene, poke)
-  return false if !Kernel.pbConfirmMessage(_INTL("Change {1}'s ability?", poke.name))
-
-  abID1 = abilityList[0][2]
-  abID2 = abilityList[0][3]
-
-  abilName2 = PBAbilities.getName(abID1)
-  abilName3 = PBAbilities.getName(abID2)
-
-  if (Kernel.pbMessage("Choose an ability.", [_INTL("{1}", abilName2), _INTL("{1}", abilName3)], 2)) == 0
-    poke.setAbility(2)
-    scene.pbDisplay(_INTL("{1}'s ability was changed to {2}!", poke.name, abilName2))
-  else
-    return false
-  end
-  poke.setAbility(3)
-  scene.pbDisplay(_INTL("{1}'s ability was changed to {2}!", poke.name, abilName3))
-  return true
-end
-
-ItemHandlers::UseOnPokemon.add(:ROCKETMEAL, proc { |item, pokemon, scene|
+ItemHandlers::UseOnPokemon.add(:ROCKETMEAL, proc { |item, quantity, pokemon, scene|
  next pbHPItem(pokemon, 100, scene)
 })

@@ -194,7 +124,7 @@ ItemHandlers::BattleUseOnPokemon.add(:ROCKETMEAL, proc { |item, pokemon, battler
  next pbBattleHPItem(pokemon, battler, 100, scene)
 })

-ItemHandlers::UseOnPokemon.add(:FANCYMEAL, proc { |item, pokemon, scene|
+ItemHandlers::UseOnPokemon.add(:FANCYMEAL, proc { |item, quantity, pokemon, scene|
  next pbHPItem(pokemon, 100, scene)
 })

@@ -202,7 +132,7 @@ ItemHandlers::BattleUseOnPokemon.add(:FANCYMEAL, proc { |item, pokemon, battler,
  next pbBattleHPItem(pokemon, battler, 100, scene)
 })

-ItemHandlers::UseOnPokemon.add(:COFFEE, proc { |item, pokemon, scene|
+ItemHandlers::UseOnPokemon.add(:COFFEE, proc { |item, quantity, pokemon, scene|
  next pbHPItem(pokemon, 50, scene)
 })

@@ -210,7 +140,7 @@ ItemHandlers::BattleUseOnPokemon.add(:COFFEE, proc { |item, pokemon, battler, sc
  next pbBattleHPItem(pokemon, battler, 50, scene)
 })

-ItemHandlers::UseOnPokemon.add(:RAGECANDYBAR, proc { |item, pokemon, scene|
+ItemHandlers::UseOnPokemon.add(:RAGECANDYBAR, proc { |item, quantity, pokemon, scene|
  if pokemon.level <= 1
    scene.pbDisplay(_INTL("It won't have any effect."))
    next false
@@ -221,7 +151,7 @@ ItemHandlers::UseOnPokemon.add(:RAGECANDYBAR, proc { |item, pokemon, scene|
  end
 })

-ItemHandlers::UseOnPokemon.add(:INCUBATOR, proc { |item, pokemon, scene|
+ItemHandlers::UseOnPokemon.add(:INCUBATOR, proc { |item, quantity, pokemon, scene|
  if pokemon.egg?
    if pokemon.eggsteps <= 1
      scene.pbDisplay(_INTL("The egg is already ready to hatch!"))
@@ -240,7 +170,7 @@ ItemHandlers::UseOnPokemon.add(:INCUBATOR, proc { |item, pokemon, scene|
  end
 })

-ItemHandlers::UseOnPokemon.add(:MISTSTONE, proc { |item, pokemon, scene|
+ItemHandlers::UseOnPokemon.add(:MISTSTONE, proc { |item, quantity, pokemon, scene|
  next false if pokemon.egg?
  if pbForceEvo(pokemon)
    next true
@@ -610,7 +540,7 @@ def useSplicerFromField(item)
  return fusion_success
 end

-ItemHandlers::UseOnPokemon.add(:DNAREVERSER, proc { |item, pokemon, scene|
+ItemHandlers::UseOnPokemon.add(:DNAREVERSER, proc { |item, quantity, pokemon, scene|
  if !pokemon.isFusion?
    scene.pbDisplay(_INTL("It won't have any effect."))
    next false
@@ -651,7 +581,7 @@ def reverseFusion(pokemon)
  }
 end

-ItemHandlers::UseOnPokemon.add(:INFINITEREVERSERS, proc { |item, pokemon, scene|
+ItemHandlers::UseOnPokemon.add(:INFINITEREVERSERS, proc { |item, quantity, pokemon, scene|
  if !pokemon.isFusion?
    scene.pbDisplay(_INTL("It won't have any effect."))
    next false
@@ -682,127 +612,6 @@ ItemHandlers::UseOnPokemon.add(:INFINITEREVERSERS, proc { |item, pokemon, scene|
  next false
 })

-#
-# def pbDNASplicing(pokemon, scene, supersplicers = false, superSplicer = false)
-#   if (pokemon.species <= NB_POKEMON)
-#     if pokemon.fused != nil
-#       if $player.party.length >= 6
-#         scene.pbDisplay(_INTL("Your party is full! You can't unfuse {1}.", pokemon.name))
-#         return false
-#       else
-#         $player.party[$player.party.length] = pokemon.fused
-#         pokemon.fused = nil
-#         pokemon.form = 0
-#         scene.pbHardRefresh
-#         scene.pbDisplay(_INTL("{1} changed Forme!", pokemon.name))
-#         return true
-#       end
-#     else
-#       chosen = scene.pbChoosePokemon(_INTL("Fuse with which Pokémon?"))
-#       if chosen >= 0
-#         poke2 = $player.party[chosen]
-#         if (poke2.species <= NB_POKEMON) && poke2 != pokemon
-#           #check if fainted
-#           if pokemon.hp == 0 || poke2.hp == 0
-#             scene.pbDisplay(_INTL("A fainted Pokémon cannot be fused!"))
-#             return false
-#           end
-#           if pbFuse(pokemon, poke2, supersplicers)
-#             pbRemovePokemonAt(chosen)
-#           end
-#         elsif pokemon == poke2
-#           scene.pbDisplay(_INTL("{1} can't be fused with itself!", pokemon.name))
-#           return false
-#         else
-#           scene.pbDisplay(_INTL("{1} can't be fused with {2}.", poke2.name, pokemon.name))
-#           return false
-#
-#         end
-#
-#       else
-#         return false
-#       end
-#     end
-#   else
-#     return true if pbUnfuse(pokemon, scene, supersplicers)
-#
-#     #unfuse
-#   end
-# end
-#
-# def pbUnfuse(pokemon, scene, supersplicers, pcPosition = nil)
-#   #pcPosition nil   : unfusing from party
-#   #pcPosition [x,x] : unfusing from pc
-#   #
-#
-#   if (pokemon.obtain_method == 2 || pokemon.ot != $player.name) # && !canunfuse
-#     scene.pbDisplay(_INTL("You can't unfuse a Pokémon obtained in a trade!"))
-#     return false
-#   else
-#     if Kernel.pbConfirmMessageSerious(_INTL("Should {1} be unfused?", pokemon.name))
-#       if pokemon.species > (NB_POKEMON * NB_POKEMON) + NB_POKEMON #triple fusion
-#         scene.pbDisplay(_INTL("{1} cannot be unfused.", pokemon.name))
-#         return false
-#       elsif $player.party.length >= 6 && !pcPosition
-#         scene.pbDisplay(_INTL("Your party is full! You can't unfuse {1}.", pokemon.name))
-#         return false
-#       else
-#         scene.pbDisplay(_INTL("Unfusing ... "))
-#         scene.pbDisplay(_INTL(" ... "))
-#         scene.pbDisplay(_INTL(" ... "))
-#
-#         bodyPoke = getBasePokemonID(pokemon.species, true)
-#         headPoke = getBasePokemonID(pokemon.species, false)
-#
-#
-#         if pokemon.exp_when_fused_head == nil || pokemon.exp_when_fused_body == nil
-#           new_level = calculateUnfuseLevelOldMethod(pokemon, supersplicers)
-#           body_level = new_level
-#           head_level = new_level
-#           poke1 = Pokemon.new(bodyPoke, body_level)
-#           poke2 = Pokemon.new(headPoke, head_level)
-#         else
-#           exp_body = pokemon.exp_when_fused_body + pokemon.exp_gained_since_fused
-#           exp_head = pokemon.exp_when_fused_head + pokemon.exp_gained_since_fused
-#
-#           poke1 = Pokemon.new(bodyPoke, pokemon.level)
-#           poke2 = Pokemon.new(headPoke, pokemon.level)
-#           poke1.exp = exp_body
-#           poke2.exp = exp_head
-#         end
-#
-#         #poke1 = PokeBattle_Pokemon.new(bodyPoke, lev, $player)
-#         #poke2 = PokeBattle_Pokemon.new(headPoke, lev, $player)
-#
-#         if pcPosition == nil
-#           box = pcPosition[0]
-#           index = pcPosition[1]
-#           $PokemonStorage.pbStoreToBox(poke2, box, index)
-#         else
-#           Kernel.pbAddPokemonSilent(poke2, poke2.level)
-#         end
-#         #On ajoute l'autre dans le pokedex aussi
-#         $player.seen[poke1.species] = true
-#         $player.owned[poke1.species] = true
-#         $player.seen[poke2.species] = true
-#         $player.owned[poke2.species] = true
-#
-#         pokemon.species = poke1.species
-#         pokemon.level = poke1.level
-#         pokemon.name = poke1.name
-#         pokemon.moves = poke1.moves
-#         pokemon.obtain_method = 0
-#         poke1.obtain_method = 0
-#
-#         #scene.pbDisplay(_INTL(p1.to_s + " " + p2.to_s))
-#         scene.pbHardRefresh
-#         scene.pbDisplay(_INTL("Your Pokémon were successfully unfused! "))
-#         return true
-#       end
-#     end
-#   end
-# end
-
 def calculateUnfuseLevelOldMethod(pokemon, supersplicers)
  if pokemon.level > 1
    if supersplicers
@@ -847,9 +656,7 @@ def drawPokemonType(pokemon_id, x_pos = 192, y_pos = 264)
  return viewport
 end

-ItemHandlers::UseOnPokemon.add(:SUPERSPLICERS, proc { |item, pokemon, scene|
-  next true if pbDNASplicing(pokemon, scene, item)
-})
+

 def returnItemsToBag(pokemon, poke2)

@@ -865,120 +672,9 @@ def returnItemsToBag(pokemon, poke2)
  poke2.item = nil
 end

-# A AJOUTER: l'attribut dmgup ne modifie presentement pas
-#           le damage d'une attaque
-#
-ItemHandlers::UseOnPokemon.add(:DAMAGEUP, proc { |item, pokemon, scene|
-  move = scene.pbChooseMove(pokemon, _INTL("Boost Damage of which move?"))
-  if move >= 0
-    # if pokemon.moves[move].damage==0 ||  pokemon.moves[move].accuracy<=5 || pokemon.moves[move].dmgup >=3
-    #  scene.pbDisplay(_INTL("It won't have any effect."))
-    #  next false
-    # else
-    # pokemon.moves[move].dmgup+=1
-    # pokemon.moves[move].damage +=5
-    # pokemon.moves[move].accuracy -=5
-
-    # movename=PBMoves.getName(pokemon.moves[move].id)
-    # scene.pbDisplay(_INTL("{1}'s damage increased.",movename))
-    # next true
-    scene.pbDisplay(_INTL("This item has not been implemented into the game yet. It had no effect."))
-    next false
-    # end
-  end
-})
-
-##New "stones"
-# ItemHandlers::UseOnPokemon.add(:UPGRADE, proc { |item, pokemon, scene|
-#   if (pokemon.isShadow? rescue false)
-#     scene.pbDisplay(_INTL("It won't have any effect."))
-#     next false
-#   end
-#   newspecies = pbCheckEvolution(pokemon, item)
-#   if newspecies <= 0
-#     scene.pbDisplay(_INTL("It won't have any effect."))
-#     next false
-#   else
-#     pbFadeOutInWithMusic(99999) {
-#       evo = PokemonEvolutionScene.new
-#       evo.pbStartScreen(pokemon, newspecies)
-#       evo.pbEvolution(false)
-#       evo.pbEndScreen
-#       scene.pbRefreshAnnotations(proc { |p| pbCheckEvolution(p, item) > 0 })
-#       scene.pbRefresh
-#     }
-#     next true
-#   end
-# })
-#
-# ItemHandlers::UseOnPokemon.add(:DUBIOUSDISC, proc { |item, pokemon, scene|
-#   if (pokemon.isShadow? rescue false)
-#     scene.pbDisplay(_INTL("It won't have any effect."))
-#     next false
-#   end
-#   newspecies = pbCheckEvolution(pokemon, item)
-#   if newspecies <= 0
-#     scene.pbDisplay(_INTL("It won't have any effect."))
-#     next false
-#   else
-#     pbFadeOutInWithMusic(99999) {
-#       evo = PokemonEvolutionScene.new
-#       evo.pbStartScreen(pokemon, newspecies)
-#       evo.pbEvolution(false)
-#       evo.pbEndScreen
-#       scene.pbRefreshAnnotations(proc { |p| pbCheckEvolution(p, item) > 0 })
-#       scene.pbRefresh
-#     }
-#     next true
-#   end
-# })
-#
-# ItemHandlers::UseOnPokemon.add(:ICESTONE, proc { |item, pokemon, scene|
-#   if (pokemon.isShadow? rescue false)
-#     scene.pbDisplay(_INTL("It won't have any effect."))
-#     next false
-#   end
-#   newspecies = pbCheckEvolution(pokemon, item)
-#   if newspecies <= 0
-#     scene.pbDisplay(_INTL("It won't have any effect."))
-#     next false
-#   else
-#     pbFadeOutInWithMusic(99999) {
-#       evo = PokemonEvolutionScene.new
-#       evo.pbStartScreen(pokemon, newspecies)
-#       evo.pbEvolution(false)
-#       evo.pbEndScreen
-#       scene.pbRefreshAnnotations(proc { |p| pbCheckEvolution(p, item) > 0 })
-#       scene.pbRefresh
-#     }
-#     next true
-#   end
-# })
-# #
-# ItemHandlers::UseOnPokemon.add(:MAGNETSTONE, proc { |item, pokemon, scene|
-#   if (pokemon.isShadow? rescue false)
-#     scene.pbDisplay(_INTL("It won't have any effect."))
-#     next false
-#   end
-#   newspecies = pbCheckEvolution(pokemon, item)
-#   if newspecies <= 0
-#     scene.pbDisplay(_INTL("It won't have any effect."))
-#     next false
-#   else
-#     pbFadeOutInWithMusic(99999) {
-#       evo = PokemonEvolutionScene.new
-#       evo.pbStartScreen(pokemon, newspecies)
-#       evo.pbEvolution(false)
-#       evo.pbEndScreen
-#       scene.pbRefreshAnnotations(proc { |p| pbCheckEvolution(p, item) > 0 })
-#       scene.pbRefresh
-#     }
-#     next true
-#   end
-# })

 # easter egg for evolving shellder into slowbro's tail
-ItemHandlers::UseOnPokemon.add(:SLOWPOKETAIL, proc { |item, pokemon, scene|
+ItemHandlers::UseOnPokemon.add(:SLOWPOKETAIL, proc { |item, quantity, pokemon, scene|
  echoln pokemon.species
  next false if pokemon.species != :SHELLDER
  pbFadeOutInWithMusic(99999) {
@@ -992,51 +688,8 @@ ItemHandlers::UseOnPokemon.add(:SLOWPOKETAIL, proc { |item, pokemon, scene|
  next true

 })
-#
-# ItemHandlers::UseOnPokemon.add(:SHINYSTONE, proc { |item, pokemon, scene|
-#   if (pokemon.isShadow? rescue false)
-#     scene.pbDisplay(_INTL("It won't have any effect."))
-#     next false
-#   end
-#   newspecies = pbCheckEvolution(pokemon, item)
-#   if newspecies <= 0
-#     scene.pbDisplay(_INTL("It won't have any effect."))
-#     next false
-#   else
-#     pbFadeOutInWithMusic(99999) {
-#       evo = PokemonEvolutionScene.new
-#       evo.pbStartScreen(pokemon, newspecies)
-#       evo.pbEvolution(false)
-#       evo.pbEndScreen
-#       scene.pbRefreshAnnotations(proc { |p| pbCheckEvolution(p, item) > 0 })
-#       scene.pbRefresh
-#     }
-#     next true
-#   end
-# })
-#
-# ItemHandlers::UseOnPokemon.add(:DAWNSTONE, proc { |item, pokemon, scene|
-#   if (pokemon.isShadow? rescue false)
-#     scene.pbDisplay(_INTL("It won't have any effect."))
-#     next false
-#   end
-#   newspecies = pbCheckEvolution(pokemon, item)
-#   if newspecies <= 0
-#     scene.pbDisplay(_INTL("It won't have any effect."))
-#     next false
-#   else
-#     pbFadeOutInWithMusic(99999) {
-#       evo = PokemonEvolutionScene.new
-#       evo.pbStartScreen(pokemon, newspecies)
-#       evo.pbEvolution(false)
-#       evo.pbEndScreen
-#       scene.pbRefreshAnnotations(proc { |p| pbCheckEvolution(p, item) > 0 })
-#       scene.pbRefresh
-#     }
-#     next true
-#   end
-# })
-ItemHandlers::UseOnPokemon.add(:POISONMUSHROOM, proc { |item, pkmn, scene|
+
+ItemHandlers::UseOnPokemon.add(:POISONMUSHROOM, proc { |item, quantity, pokemon, scene|
  if pkmn.status != :POISON
    pkmn.status = :POISON
    scene.pbRefresh
@@ -1053,74 +706,25 @@ ItemHandlers::BattleUseOnPokemon.add(:POISONMUSHROOM, proc { |item, pokemon, bat
  pbBattleHPItem(pokemon, battler, 10, scene)
 })

-ItemHandlers::UseOnPokemon.add(:TINYMUSHROOM, proc { |item, pkmn, scene|
+ItemHandlers::UseOnPokemon.add(:TINYMUSHROOM, proc { |item, quantity, pokemon, scene|
  next pbHPItem(pkmn, 10, scene)
 })
 ItemHandlers::BattleUseOnPokemon.add(:TINYMUSHROOM, proc { |item, pokemon, battler, choices, scene|
  next pbBattleHPItem(pokemon, battler, 50, scene)
 })
-ItemHandlers::UseOnPokemon.add(:BIGMUSHROOM, proc { |item, pkmn, scene|
+ItemHandlers::UseOnPokemon.add(:BIGMUSHROOM, proc { |item, quantity, pokemon, scene|
  next pbHPItem(pkmn, 10, scene)
 })
 ItemHandlers::BattleUseOnPokemon.add(:BIGMUSHROOM, proc { |item, pokemon, battler, choices, scene|
  next pbBattleHPItem(pokemon, battler, 50, scene)
 })
-ItemHandlers::UseOnPokemon.add(:BALMMUSHROOM, proc { |item, pkmn, scene|
+ItemHandlers::UseOnPokemon.add(:BALMMUSHROOM, proc { |item, quantity, pokemon, scene|
  next pbHPItem(pkmn, 999, scene)
 })
 ItemHandlers::BattleUseOnPokemon.add(:BALMMUSHROOM, proc { |item, pokemon, battler, choices, scene|
  next pbBattleHPItem(pokemon, battler, 999, scene)
 })

-#
-# #TRACKER (for roaming legendaries)
-# ItemHandlers::UseInField.add(:REVEALGLASS, proc { |item|
-#   if Settings::ROAMING_SPECIES.length == 0
-#     Kernel.pbMessage(_INTL("No roaming Pokémon defined."))
-#   else
-#     text = "\\l[8]"
-#     min = $game_switches[350] ? 0 : 1
-#     for i in min...Settings::ROAMING_SPECIES.length
-#       poke = Settings::ROAMING_SPECIES[i]
-#       next if poke == PBSPecies::FEEBAS
-#       if $game_switches[poke[2]]
-#         status = $PokemonGlobal.roamPokemon[i]
-#         if status == true
-#           if $PokemonGlobal.roamPokemonCaught[i]
-#             text += _INTL("{1} has been caught.",
-#                           PBSpecies.getName(getID(PBSpecies, poke[0])))
-#           else
-#             text += _INTL("{1} has been defeated.",
-#                           PBSpecies.getName(getID(PBSpecies, poke[0])))
-#           end
-#         else
-#           curmap = $PokemonGlobal.roamPosition[i]
-#           if curmap
-#             mapinfos = $RPGVX ? load_data("Data/MapInfos.rvdata") : load_data("Data/MapInfos.rxdata")
-#
-#             if curmap == $game_map.map_id
-#               text += _INTL("Beep beep! {1} appears to be nearby!",
-#                             PBSpecies.getName(getID(PBSpecies, poke[0])))
-#             else
-#               text += _INTL("{1} is roaming around {3}",
-#                             PBSpecies.getName(getID(PBSpecies, poke[0])), curmap,
-#                             mapinfos[curmap].name, (curmap == $game_map.map_id) ? _INTL("(this route!)") : "")
-#             end
-#           else
-#             text += _INTL("{1} is roaming in an unknown area.",
-#                           PBSpecies.getName(getID(PBSpecies, poke[0])), poke[1])
-#           end
-#         end
-#       else
-#         #text+=_INTL("{1} does not appear to be roaming.",
-#         #   PBSpecies.getName(getID(PBSpecies,poke[0])),poke[1],poke[2])
-#       end
-#       text += "\n" if i < Settings::ROAMING_SPECIES.length - 1
-#     end
-#     Kernel.pbMessage(text)
-#   end
-# })
-
 ####EXP. ALL
 # Methodes relative a l'exp sont pas encore la et pas compatibles
 # avec cette version de essentials donc
@@ -1142,18 +746,18 @@ ItemHandlers::UseFromBag.add(:EXPALLOFF, proc { |item|
 ItemHandlers::BattleUseOnPokemon.add(:BANANA, proc { |item, pokemon, battler, scene|
  next pbBattleHPItem(pokemon, battler, 30, scene)
 })
-ItemHandlers::UseOnPokemon.add(:BANANA, proc { |item, pokemon, scene|
+ItemHandlers::UseOnPokemon.add(:BANANA, proc { |item, quantity, pokemon, scene|
  next pbHPItem(pokemon, 30, scene)
 })

 ItemHandlers::BattleUseOnPokemon.add(:GOLDENBANANA, proc { |item, pokemon, battler, scene|
  next pbBattleHPItem(pokemon, battler, 50, scene)
 })
-ItemHandlers::UseOnPokemon.add(:GOLDENBANANA, proc { |item, pokemon, scene|
+ItemHandlers::UseOnPokemon.add(:GOLDENBANANA, proc { |item, quantity, pokemon, scene|
  next pbHPItem(pokemon, 50, scene)
 })

-ItemHandlers::UseOnPokemon.add(:TRANSGENDERSTONE, proc { |item, pokemon, scene|
+ItemHandlers::UseOnPokemon.add(:TRANSGENDERSTONE, proc { |item, quantity, pokemon, scene|
  if pokemon.gender == 0
    pokemon.makeFemale
    scene.pbRefresh
@@ -1198,7 +802,7 @@ ItemHandlers::UseOnPokemon.add(:TRANSGENDERSTONE, proc { |item, pokemon, scene|
 # })

 # NOT FULLY IMPLEMENTED
-ItemHandlers::UseOnPokemon.add(:SECRETCAPSULE, proc { |item, poke, scene|
+ItemHandlers::UseOnPokemon.add(:SECRETCAPSULE,proc { |item, quantity, pokemon, scene|
  abilityList = poke.getAbilityList
  numAbilities = abilityList[0].length

@@ -1251,23 +855,23 @@ def changeHiddenAbility2(abilityList, scene, poke)
  return true
 end

-ItemHandlers::UseOnPokemon.add(:ROCKETMEAL, proc { |item, pokemon, scene|
+ItemHandlers::UseOnPokemon.add(:ROCKETMEAL,proc { |item, quantity, pokemon, scene|
  next pbHPItem(pokemon, 100, scene)
 })

-ItemHandlers::BattleUseOnPokemon.add(:ROCKETMEAL, proc { |item, pokemon, battler, scene|
+ItemHandlers::BattleUseOnPokemon.add(:ROCKETMEAL, proc { |item, pokemon, battler, choices, scene|
  next pbBattleHPItem(pokemon, battler, 100, scene)
 })

-ItemHandlers::UseOnPokemon.add(:FANCYMEAL, proc { |item, pokemon, scene|
+ItemHandlers::UseOnPokemon.add(:FANCYMEAL, proc { |item, quantity, pokemon, scene|
  next pbHPItem(pokemon, 100, scene)
 })

-ItemHandlers::BattleUseOnPokemon.add(:FANCYMEAL, proc { |item, pokemon, battler, scene|
+ItemHandlers::BattleUseOnPokemon.add(:FANCYMEAL,proc { |item, pokemon, battler, choices, scene|
  next pbBattleHPItem(pokemon, battler, 100, scene)
 })

-ItemHandlers::UseOnPokemon.add(:RAGECANDYBAR, proc { |item, pokemon, scene|
+ItemHandlers::UseOnPokemon.add(:RAGECANDYBAR, proc { |item, quantity, pokemon, scene|
  if pokemon.level <= 1
    scene.pbDisplay(_INTL("It won't have any effect."))
    next false
@@ -1278,7 +882,7 @@ ItemHandlers::UseOnPokemon.add(:RAGECANDYBAR, proc { |item, pokemon, scene|
  end
 })

-ItemHandlers::UseOnPokemon.add(:INCUBATOR, proc { |item, pokemon, scene|
+ItemHandlers::UseOnPokemon.add(:INCUBATOR, proc { |item, quantity, pokemon, scene|
  if pokemon.egg?
    if pokemon.steps_to_hatch <= 1
      scene.pbDisplay(_INTL("The egg is already ready to hatch!"))
@@ -1297,7 +901,7 @@ ItemHandlers::UseOnPokemon.add(:INCUBATOR, proc { |item, pokemon, scene|
  end
 })

-ItemHandlers::UseOnPokemon.add(:INCUBATOR_NORMAL, proc { |item, pokemon, scene|
+ItemHandlers::UseOnPokemon.add(:INCUBATOR_NORMAL, proc { |item, quantity, pokemon, scene|
  if pokemon.egg?
    steps = pokemon.steps_to_hatch
    steps = (steps / 1.5).ceil
@@ -1336,7 +940,7 @@ ItemHandlers::UseOnPokemon.add(:INCUBATOR_NORMAL, proc { |item, pokemon, scene|
  end
 })

-ItemHandlers::UseOnPokemon.add(:MISTSTONE, proc { |item, pokemon, scene|
+ItemHandlers::UseOnPokemon.add(:MISTSTONE, proc { |item, quantity, pokemon, scene|
  next false if pokemon.egg?
  if pbForceEvo(pokemon)
    next true
@@ -1394,50 +998,27 @@ end
 ##  DNA SPLICERS  #######
 #########################

-ItemHandlers::UseOnPokemon.add(:INFINITESPLICERS, proc { |item, pokemon, scene|
+ItemHandlers::UseOnPokemon.add(:INFINITESPLICERS, proc { |item, quantity, pokemon, scene|
  next true if pbDNASplicing(pokemon, scene, item)
  next false
 })

-ItemHandlers::UseOnPokemon.add(:INFINITESPLICERS2, proc { |item, pokemon, scene|
+ItemHandlers::UseOnPokemon.add(:INFINITESPLICERS2,proc { |item, quantity, pokemon, scene|
  next true if pbDNASplicing(pokemon, scene, item)
  next false
 })

-ItemHandlers::UseOnPokemon.add(:DNASPLICERS, proc { |item, pokemon, scene|
+ItemHandlers::UseOnPokemon.add(:DNASPLICERS, proc { |item, quantity, pokemon, scene|
  next true if pbDNASplicing(pokemon, scene, item)
  next false
 })

-ItemHandlers::UseOnPokemon.add(:SUPERSPLICERS, proc { |item, pokemon, scene|
+ItemHandlers::UseOnPokemon.add(:SUPERSPLICERS, proc { |item, quantity, pokemon, scene|
  next true if pbDNASplicing(pokemon, scene, item)
 })



-# A AJOUTER: l'attribut dmgup ne modifie presentement pas
-#           le damage d'une attaque
-#
-ItemHandlers::UseOnPokemon.add(:DAMAGEUP, proc { |item, pokemon, scene|
-  move = scene.pbChooseMove(pokemon, _INTL("Boost Damage of which move?"))
-  if move >= 0
-    # if pokemon.moves[move].damage==0 ||  pokemon.moves[move].accuracy<=5 || pokemon.moves[move].dmgup >=3
-    #  scene.pbDisplay(_INTL("It won't have any effect."))
-    #  next false
-    # else
-    # pokemon.moves[move].dmgup+=1
-    # pokemon.moves[move].damage +=5
-    # pokemon.moves[move].accuracy -=5
-
-    # movename=PBMoves.getName(pokemon.moves[move].id)
-    # scene.pbDisplay(_INTL("{1}'s damage increased.",movename))
-    # next true
-    scene.pbDisplay(_INTL("This item has not been implemented into the game yet. It had no effect."))
-    next false
-    # end
-  end
-})
-

 ItemHandlers::UseFromBag.add(:DEVONSCOPE, proc { |item|
  pbQuestlog()
@@ -1480,7 +1061,7 @@ ItemHandlers::UseFromBag.add(:EXPALLOFF, proc { |item|
 ItemHandlers::BattleUseOnPokemon.add(:BANANA, proc { |item, pokemon, battler, scene|
  next pbBattleHPItem(pokemon, battler, 30, scene)
 })
-ItemHandlers::UseOnPokemon.add(:BANANA, proc { |item, pokemon, scene|
+ItemHandlers::UseOnPokemon.add(:BANANA, proc { |item, quantity, pokemon, scene|
  next pbHPItem(pokemon, 30, scene)
 })

--- a/Data/Scripts/998_InfiniteFusion/Outfits/Overrides/PIFOutfits_Game_Map.rb
+++ b/Data/Scripts/998_InfiniteFusion/Outfits/Overrides/PIFOutfits_Game_Map.rb
--- a/Data/Scripts/998_InfiniteFusion/Outfits/Overrides/PIFOutfits_Scene_Map.rb
+++ b/Data/Scripts/998_InfiniteFusion/Outfits/Overrides/PIFOutfits_Scene_Map.rb
--- a/Data/Scripts/998_InfiniteFusion/Outfits/Overrides/PIFOutfits_Sprite_Character.rb
+++ b/Data/Scripts/998_InfiniteFusion/Outfits/Overrides/PIFOutfits_Sprite_Character.rb
--- a/Data/Scripts/998_InfiniteFusion/Outfits/Overrides/PIFOutfits_Sprite_Player.rb
+++ b/Data/Scripts/998_InfiniteFusion/Outfits/Overrides/PIFOutfits_Sprite_Player.rb
--- a/Data/Scripts/998_InfiniteFusion/Outfits/Overrides/PIFOutfits_Sprite_SurfBase.rb
+++ b/Data/Scripts/998_InfiniteFusion/Outfits/Overrides/PIFOutfits_Sprite_SurfBase.rb
--- a/Data/Scripts/998_InfiniteFusion/Outfits/Overrides/PIFOutfits_Spriteset_Global.rb
+++ b/Data/Scripts/998_InfiniteFusion/Outfits/Overrides/PIFOutfits_Spriteset_Global.rb
--- a/Data/Scripts/998_InfiniteFusion/Outfits/Overrides/PIFOutfits_TrainerWalkingCharSprite.rb
+++ b/Data/Scripts/998_InfiniteFusion/Outfits/Overrides/PIFOutfits_TrainerWalkingCharSprite.rb
@@ -0,0 +1,52 @@
+
+class TrainerWalkingCharSprite
+
+  alias pokemonEssentials_TrainerWalkingCharSprite_initialize initialize
+  def initialize(charset,viewport=nil,trainer=nil)
+    @trainer=trainer
+    pokemonEssentials_TrainerWalkingCharSprite_initialize(charset,viewport)
+
+  end
+  def charset=(value)
+    isPlayerCharacter = value == "walk" #todo: passe de l'ours à corriger
+    echoln value
+    @animbitmap&.dispose
+    @animbitmap = nil
+    bitmapFileName = sprintf("Graphics/Characters/%s", value)
+    @charset = pbResolveBitmap(bitmapFileName)
+    if @charset
+      if isPlayerCharacter
+        outfit_bitmap = _INTL("Graphics/Characters/players/outfits/{1}_{2}",value,$Trainer.outfit) if $Trainer && $Trainer.outfit
+        @trainer = $Trainer if !@trainer
+        @animbitmap = AnimatedBitmap.new(@charset)
+        @animbitmap.bitmap = generateClothedBitmapStatic(@trainer)
+        @animbitmap.bitmap.blt(0, 0, outfit_bitmap, outfit_bitmap.rect) if pbResolveBitmap(outfit_bitmap)
+      else
+        @animbitmap = AnimatedBitmap.new(@charset)
+      end
+      self.bitmap = @animbitmap.bitmap
+      self.src_rect.set(0, 0, self.bitmap.width / 4, self.bitmap.height / 4)
+    else
+      self.bitmap = nil
+    end
+  end
+end
+
+
+
+class UI::LoadContinuePanel
+  def initialize_player_sprite
+    meta = GameData::PlayerMetadata.get(@save_data[:player].character_ID)
+    filename = pbGetPlayerCharset(meta.walk_charset, @save_data[:player], true)
+    @sprites[:player] = TrainerWalkingCharSprite.new(filename, @viewport,@save_data[:player])
+    if !@sprites[:player].bitmap
+      raise _INTL("Overrides character {1}'s walking charset was not found (filename: \"{2}\").",
+                  @save_data[:player].character_ID, filename)
+    end
+    @sprites[:player].x = 48 - (@sprites[:player].bitmap.width / 8)
+    @sprites[:player].y = 72 - (@sprites[:player].bitmap.height / 8)
+    @sprites[:player].z = 1
+    record_values(:player)
+  end
+
+end
--- a/Data/Scripts/998_InfiniteFusion/QoL/SpeedUp.rb
+++ b/Data/Scripts/998_InfiniteFusion/QoL/SpeedUp.rb
@@ -42,11 +42,17 @@ module Input
      $PokemonSystem.speedup_speed = 0 if !$PokemonSystem.speedup_speed || $PokemonSystem.speedup_speed == 0
      $GameSpeed = $PokemonSystem.speedup_speed
      $PokemonSystem.battle_speed = $GameSpeed
+
+      # Allow input to work during animations
+      if $PokemonSystem.only_speedup_battles == 1
+        Battle::AnimationHandler.process_speedup
+      end
    else
      $GameSpeed = 0
    end
  end

+
  def self.speed_up_toggle
    $PokemonSystem.speedup_enabled = !$PokemonSystem.speedup_enabled
    pbPlayDecisionSE
@@ -195,29 +201,37 @@ end
 # Fix for animation index crash
 #===============================================================================#
 class SpriteAnimation
-  def update_animation
-    new_index = ((System.uptime - @_animation_timer_start) / @_animation_time_per_frame).to_i
-    if new_index >= @_animation_duration
-      dispose_animation
-      return
-    end
-    quick_update = (@_animation_index == new_index)
-    @_animation_index = new_index
-    frame_index = @_animation_index
-    current_frame = @_animation.frames[frame_index]
-    unless current_frame
-      dispose_animation
-      return
-    end
-    cell_data = current_frame.cell_data
-    position = @_animation.position
-    animation_set_sprites(@_animation_sprites, cell_data, position, quick_update)
-    return if quick_update
-    @_animation.timings.each do |timing|
-      next if timing.frame != frame_index
-      animation_process_timing(timing, @_animation_hit)
+  class SpriteAnimation
+    def update_animation
+      # Speed up the animation by reducing the wait time between frames
+      if $PokemonSystem.speedup_enabled && $GameSpeed > 1
+        @_animation_time_per_frame *= 1.0 / $GameSpeed
+      end
+
+      new_index = ((System.uptime - @_animation_timer_start) / @_animation_time_per_frame).to_i
+      if new_index >= @_animation_duration
+        dispose_animation
+        return
+      end
+      quick_update = (@_animation_index == new_index)
+      @_animation_index = new_index
+      frame_index = @_animation_index
+      current_frame = @_animation.frames[frame_index]
+      unless current_frame
+        dispose_animation
+        return
+      end
+      cell_data = current_frame.cell_data
+      position = @_animation.position
+      animation_set_sprites(@_animation_sprites, cell_data, position, quick_update)
+      return if quick_update
+      @_animation.timings.each do |timing|
+        next if timing.frame != frame_index
+        animation_process_timing(timing, @_animation_hit)
+      end
    end
  end
+
 end

 #===============================================================================#
--- a/Data/Scripts/998_InfiniteFusion/Sprites/001_PifSpriteBitmapCache.rb
+++ b/Data/Scripts/998_InfiniteFusion/Sprites/001_PifSpriteBitmapCache.rb
@@ -0,0 +1,52 @@
+class SpritesBitmapCache
+  @@cache = {} # Cache storage for individual sprites
+  @@usage_order = [] # Tracks usage order for LRU eviction
+
+  def getCache()
+    return @@cache
+  end
+
+  def get_bitmap(pif_sprite)
+    sprite_key = get_cache_key(pif_sprite)
+    if @@cache.key?(sprite_key)
+      mark_key_as_recently_used(sprite_key)
+      return @@cache[sprite_key].clone
+    end
+    return nil
+  end
+
+  def mark_key_as_recently_used(sprite_key)
+    @@usage_order.delete(sprite_key)
+    @@usage_order << sprite_key
+  end
+
+  #Keys format: [type]_B[body]H[head]_letter
+  # ex:
+  # AUTOGEN_B12H12_
+  # CUSTOM_B12H12_a
+  # BASE_BH12_a
+  # etc.
+  def get_cache_key(pif_sprite)
+    return "#{pif_sprite.type.to_s}_B#{pif_sprite.body_id}H#{pif_sprite.head_id}_#{pif_sprite.alt_letter}".to_sym
+  end
+
+  #Keys format: AUTOGEN_B12H12_a
+  def add(pif_sprite,bitmap)
+    sprite_key = get_cache_key(pif_sprite)
+    echoln "adding key #{sprite_key} to cache"
+    @@cache[sprite_key] = bitmap.clone
+
+    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 sprite cache"
+    end
+    @@usage_order << sprite_key
+  end
+
+  def clear
+    @@cache = {}
+    @@usage_order = []
+  end
+end
--- a/Data/Scripts/998_InfiniteFusion/Sprites/002_PIFSpriteExtracter.rb
+++ b/Data/Scripts/998_InfiniteFusion/Sprites/002_PIFSpriteExtracter.rb
@@ -0,0 +1,98 @@
+class PIFSpriteExtracter
+  COLUMNS = 20               # Number of columns in the spritesheet
+  @@spritesheet_cache = SpritesBitmapCache.new
+
+  #factor by which the sprite needs to be resized to get it to base game resolution (288x288)
+  def get_resize_scale
+    return 1
+  end
+
+  def load_sprite(pif_sprite,download_allowed=true)
+    begin
+      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
+        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
+    rescue Exception
+      e = $!
+      echoln "Error loading sprite: #{e}" if bitmap
+    end
+  end
+
+  def download_new_spritesheet(pif_sprite)
+    spritesheet_file = getSpritesheetPath(pif_sprite)
+    if download_spritesheet(pif_sprite,spritesheet_file)
+      $updated_spritesheets << spritesheet_file
+      update_downloaded_spritesheets_list()
+      return true
+    end
+    return false
+  end
+
+  def update_downloaded_spritesheets_list()
+    File.open(Settings::UPDATED_SPRITESHEETS_CACHE, "w") do |file|
+      $updated_spritesheets.each { |line| file.puts(line) }
+    end
+  end
+
+  def get_sprite_position_on_spritesheet(body_id,sprite_size,nb_column)
+    row = body_id / nb_column
+    col = body_id % nb_column
+    # echoln "(#{col},#{row})"
+    # Define the area of the sprite on the spritesheet
+    sprite_x_position = col * sprite_size
+    sprite_y_position = row * sprite_size
+    return sprite_x_position, sprite_y_position
+  end
+
+
+  def extract_bitmap_to_file(pif_sprite, dest_folder)
+    # Create the directory if it doesn't exist
+    Dir.mkdir(dest_folder) unless Dir.exist?(dest_folder)
+    single_sprite_bitmap=load_sprite(pif_sprite)
+
+    # Save the single sprite bitmap to a file
+    file_path = "#{dest_folder}/#{head_id}.#{body_id}.png"
+    single_sprite_bitmap.save_to_png(file_path)
+
+    # Dispose of the single sprite bitmap
+    single_sprite_bitmap.dispose
+
+    # Return the path to the saved PNG file
+    return file_path
+  end
+
+  #Implemented for base and custom, not autogen
+  def should_update_spritesheet?(spritesheet_file)
+    return false
+  end
+
+  def getSpritesheetPath(pif_sprite)
+    return nil #implement in subclasses
+  end
+
+  def clear_cache()
+    @@spritesheet_cache.clear
+  end
+
+end
+
+class PokemonGlobalMetadata
+  attr_accessor :current_spritepack_date
+end
--- a/Data/Scripts/998_InfiniteFusion/Sprites/AutogenExtracter.rb
+++ b/Data/Scripts/998_InfiniteFusion/Sprites/AutogenExtracter.rb
@@ -0,0 +1,160 @@
+class AutogenExtracter < PIFSpriteExtracter
+  SPRITESHEET_FOLDER_PATH = "Graphics\\Battlers\\spritesheets_autogen\\"
+  SPRITE_SIZE = 96 # Size of each sprite in the spritesheet
+  COLUMNS = 10 # Number of columns in the spritesheet
+  SHEET_WIDTH = SPRITE_SIZE * COLUMNS # 2880 pixels wide spritesheet
+
+  @instance = new
+  def self.instance
+    @@instance ||= new # If @@instance is nil, create a new instance
+    @@instance # Return the existing or new instance
+  end
+
+  def load_bitmap_from_spritesheet(pif_sprite)
+    body_id = pif_sprite.body_id
+    spritesheet_file = getSpritesheetPath(pif_sprite)
+    spritesheet_bitmap = AnimatedBitmap.new(spritesheet_file).bitmap
+
+    # Extract individual sprite
+    sprite_x_position, sprite_y_position = get_sprite_position_on_spritesheet(body_id, SPRITE_SIZE, COLUMNS)
+    src_rect = Rect.new(sprite_x_position, sprite_y_position, SPRITE_SIZE, SPRITE_SIZE)
+
+    bitmap = Bitmap.new(SPRITE_SIZE, SPRITE_SIZE)
+    bitmap.blt(0, 0, spritesheet_bitmap, src_rect)
+
+    # Dispose of spritesheet if it's no longer needed
+    spritesheet_bitmap.dispose
+    return bitmap
+  end
+
+  def getSpritesheetPath(pif_sprite)
+    head_id = pif_sprite.head_id
+    return "#{SPRITESHEET_FOLDER_PATH}#{head_id}.png"
+  end
+
+  def get_resize_scale
+    return 3
+  end
+  #
+  #   # Check cache before loading from disk
+  #   sprite_bitmap = @@spritesheet_cache.fetch(pif_sprite) do
+  #     # Load spritesheet from disk if necessary
+  #     echoln "Loading spritesheet from disk: #{spritesheet_file}"
+  #     spritesheet_bitmap = AnimatedBitmap.new(spritesheet_file).bitmap
+  #
+  #     # Extract individual sprite
+  #     sprite_x_position, sprite_y_position = get_sprite_position_on_spritesheet(body_id, SPRITE_SIZE, COLUMNS)
+  #     src_rect = Rect.new(sprite_x_position, sprite_y_position, SPRITE_SIZE, SPRITE_SIZE)
+  #
+  #     sprite = Bitmap.new(SPRITE_SIZE, SPRITE_SIZE)
+  #     sprite.blt(0, 0, spritesheet_bitmap, src_rect)
+  #
+  #     # Dispose of spritesheet if it's no longer needed
+  #     spritesheet_bitmap.dispose
+  #
+  #     sprite
+  #   end
+  #   animatedBitmap = AnimatedBitmap.from_bitmap(sprite_bitmap)
+  #
+  #   end_time = Time.now
+  #   echoln "finished load sprite in  #{end_time - start_time} seconds"
+  #   echoln animatedBitmap
+  #   return animatedBitmap
+  # end
+
+  def load_sprite_with_spritesheet_cache(pif_sprite)
+    start_time = Time.now
+    head_id = pif_sprite.head_id
+    body_id = pif_sprite.body_id
+    spritesheet_file = "#{SPRITESHEET_FOLDER_PATH}#{head_id}.png"
+
+    # Check cache before loading from disk
+    spritesheet_bitmap = @@spritesheet_cache.fetch(spritesheet_file) do
+      echoln "Loading spritesheet from disk: #{spritesheet_file}"
+      AnimatedBitmap.new(spritesheet_file).bitmap
+    end
+
+    sprite_x_position, sprite_y_position = get_sprite_position_on_spritesheet(body_id, SPRITE_SIZE, COLUMNS)
+    src_rect = Rect.new(sprite_x_position, sprite_y_position, SPRITE_SIZE, SPRITE_SIZE)
+
+    sprite_bitmap = Bitmap.new(SPRITE_SIZE, SPRITE_SIZE)
+    sprite_bitmap.blt(0, 0, spritesheet_bitmap, src_rect)
+
+    #spritesheet_bitmap.dispose  # Dispose since not needed
+
+    animatedBitmap = AnimatedBitmap.from_bitmap(sprite_bitmap)
+
+    end_time = Time.now
+    echoln "finished load sprite in  #{end_time - start_time} seconds"
+
+    return animatedBitmap
+  end
+end
+
+# def extract_bitmap_to_file(head_id, body_id, folder)
+#   # Create the directory if it doesn't exist
+#   Dir.mkdir(folder) unless Dir.exist?(folder)
+#
+#   # Load the entire spritesheet
+#   spritesheet_file = "#{SPRITESHEET_FOLDER_PATH}#{head_id}.png"
+#   spritesheet_bitmap = AnimatedBitmap.new(spritesheet_file).bitmap
+#
+#   # Calculate the 0-based row and column from the sprite index
+#   zero_index = body_id - 1
+#   row = zero_index / COLUMNS
+#   col = zero_index % COLUMNS
+#
+#   # Define the area of the sprite on the spritesheet
+#   sprite_x_position = col * SPRITE_SIZE
+#   sprite_y_position = row * SPRITE_SIZE
+#
+#   # Create a new bitmap for the single sprite
+#   single_sprite_bitmap = Bitmap.new(SPRITE_SIZE, SPRITE_SIZE)
+#   single_sprite_bitmap.blt(0, 0, spritesheet_bitmap, Rect.new(sprite_x_position, sprite_y_position, SPRITE_SIZE, SPRITE_SIZE))
+#
+#   # Dispose of the spritesheet bitmap if it’s no longer needed
+#   spritesheet_bitmap.dispose
+#
+#   # Save the single sprite bitmap to a file
+#   file_path = "#{folder}/#{head_id}.#{body_id}.png"
+#   single_sprite_bitmap.save_to_png(file_path)
+#
+#   # Dispose of the single sprite bitmap
+#   single_sprite_bitmap.dispose
+#
+#   # Return the path to the saved PNG file
+#   return file_path
+# end
+#end
+#
+#
+# class SpritesBitmapCache
+#   @@cache = {} # Cache storage for individual sprites
+#   @@usage_order = [] # Tracks usage order for LRU eviction
+#
+#   def self.fetch(pif_sprite)
+#     sprite_key = "B#{pif_sprite.body_id}H#{pif_sprite.head_id}".to_sym
+#     if @@cache.key?(sprite_key)
+#       # Move key to the end to mark it as recently used
+#       @@usage_order.delete(sprite_key)
+#       @@usage_order << sprite_key
+#       return @@cache[sprite_key]
+#     end
+#
+#     # Load sprite via block if not found in cache
+#     sprite_bitmap = 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 sprite cache"
+#     end
+#
+#     # Add new sprite to cache and track its usage
+#     @@cache[sprite_key] = sprite_bitmap
+#     @@usage_order << sprite_key
+#     sprite_bitmap
+#     echoln @@cache
+#   end
+# end
--- a/Data/Scripts/998_InfiniteFusion/Sprites/BaseSpriteExtracter.rb
+++ b/Data/Scripts/998_InfiniteFusion/Sprites/BaseSpriteExtracter.rb
@@ -0,0 +1,61 @@
+class BaseSpriteExtracter < PIFSpriteExtracter
+  @instance = new
+
+  def self.instance
+    @@instance ||= new # If @@instance is nil, create a new instance
+    @@instance # Return the existing or new instance
+  end
+
+  SPRITESHEET_FOLDER_PATH = "Graphics/CustomBattlers/spritesheets/spritesheets_base/"
+  SPRITE_SIZE = 96 # Original sprite size
+  NB_COLUMNS_BASESPRITES = 10
+  SHEET_WIDTH = SPRITE_SIZE * NB_COLUMNS_BASESPRITES # 2880 pixels wide spritesheet
+  def load_bitmap_from_spritesheet(pif_sprite)
+    alt_letter = pif_sprite.alt_letter
+    spritesheet_file = getSpritesheetPath(pif_sprite)
+    spritesheet_bitmap = AnimatedBitmap.new(spritesheet_file).bitmap
+
+    letter_index = letters_to_index(alt_letter)
+    sprite_x_position, sprite_y_position = get_sprite_position_on_spritesheet(letter_index, SPRITE_SIZE, NB_COLUMNS_BASESPRITES)
+    src_rect = Rect.new(sprite_x_position, sprite_y_position, SPRITE_SIZE, SPRITE_SIZE)
+
+    sprite_bitmap = Bitmap.new(SPRITE_SIZE, SPRITE_SIZE)
+    sprite_bitmap.blt(0, 0, spritesheet_bitmap, src_rect)
+    spritesheet_bitmap.dispose # Dispose since not needed
+
+    return sprite_bitmap
+  end
+
+  def letters_to_index(letters)
+    letters = letters.downcase # Ensure input is case-insensitive
+    index = 0
+    letters.each_char do |char|
+      index = index * 26 + (char.ord - 'a'.ord + 1)
+    end
+    #echoln "index: #{index}"
+    return index
+  end
+
+  def load_sprite_directly(head_id, body_id, alt_letter = "")
+    load_sprite(PIFSprite.new(:CUSTOM, head_id, body_id, alt_letter))
+  end
+
+  def getSpritesheetPath(pif_sprite)
+    dex_number = getDexNumberForSpecies(pif_sprite.head_id)
+    return "#{SPRITESHEET_FOLDER_PATH}#{dex_number}.png"
+  end
+
+  def should_update_spritesheet?(pif_sprite)
+    return false if !$updated_spritesheets
+    return false if !downloadAllowed?()
+    return false if requestRateExceeded?(Settings::CUSTOMSPRITES_RATE_LOG_FILE,Settings::CUSTOMSPRITES_ENTRIES_RATE_TIME_WINDOW,Settings::CUSTOMSPRITES_RATE_MAX_NB_REQUESTS,false)
+    spritesheet_file = getSpritesheetPath(pif_sprite)
+    return true if !pbResolveBitmap(spritesheet_file)
+
+    return !$updated_spritesheets.include?(spritesheet_file)
+  end
+
+  def get_resize_scale
+    return 3
+  end
+end
--- a/Data/Scripts/998_InfiniteFusion/Sprites/BattleSpriteLoader.rb
+++ b/Data/Scripts/998_InfiniteFusion/Sprites/BattleSpriteLoader.rb
@@ -0,0 +1,275 @@
+class BattleSpriteLoader
+  def initialize
+    @download_allowed = true
+  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
+
+  #random alt
+  def load_pif_sprite(pif_sprite)
+    case pif_sprite.type
+    when :CUSTOM, :AUTOGEN
+      load_fusion_sprite(pif_sprite.head_id, pif_sprite.body_id)
+    when :BASE
+      load_base_sprite(pif_sprite.head_id)
+    end
+  end
+
+  # Only preloads if the pokemon's sprite has been assigned an alt letter
+  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
+    pif_sprite = $PokemonGlobal.alt_sprite_substitutions[substitution_id] if $PokemonGlobal
+    if !pif_sprite
+      pif_sprite = get_pif_sprite_from_species(pokemon.species)
+    end
+    preload(pif_sprite)
+  end
+
+  #loads a sprite into cache without actually returning it
+  # Does not download spritesheet
+  def preload(pif_sprite)
+    echoln "preloading"
+    previous_download_allowed = @download_allowed
+    @download_allowed = false
+    load_pif_sprite(pif_sprite)
+    @download_allowed = previous_download_allowed
+  end
+
+  def clear_sprites_cache(type)
+    extractor = get_sprite_extractor_instance(type)
+    extractor.clear_cache
+  end
+
+  def load_from_dex_number(dex_number)
+    if dex_number > NB_POKEMON
+      if dex_number > ZAPMOLCUNO_NB #Triple Fusion
+        return load_triple_fusion_sprite(dex_number)
+      else
+        #Regular fusion
+        body_id = getBodyID(dex_number)
+        head_id = getHeadID(dex_number, body_id)
+        return load_fusion_sprite(head_id, body_id)
+      end
+    else
+      #base pokemon
+      return load_base_sprite(dex_number)
+    end
+  end
+
+  def obtain_fusion_pif_sprite(head_id,body_id)
+    $PokemonGlobal.alt_sprite_substitutions = {} unless $PokemonGlobal.alt_sprite_substitutions
+    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)
+    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)
+    if !loaded_sprite
+      loaded_sprite = handle_unloaded_sprites(extractor,pif_sprite)
+    end
+    return loaded_sprite
+  end
+
+  def load_base_sprite(dex_number)
+    substitution_id = get_sprite_substitution_id_from_dex_number(dex_number)
+    pif_sprite = $PokemonGlobal.alt_sprite_substitutions[substitution_id] if $PokemonGlobal
+    if !pif_sprite
+      pif_sprite = select_new_pif_base_sprite(dex_number)
+      $PokemonGlobal.alt_sprite_substitutions[substitution_id] = pif_sprite if $PokemonGlobal
+    end
+    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)
+    if !loaded_sprite
+      loaded_sprite = handle_unloaded_sprites(extractor,pif_sprite)
+    end
+    return loaded_sprite
+  end
+
+  def handle_unloaded_sprites(extractor,pif_sprite)
+    if(extractor.is_a?(CustomSpriteExtracter)) #Custom failed to load, load an autogen (which should always be there)
+      new_extractor = get_sprite_extractor_instance(:AUTOGEN)
+      return new_extractor.load_sprite(pif_sprite)
+    else
+      $Trainer.seen_qmarks_sprite=true if $Trainer
+      #If autogen or base sprite aren't able to load a sprite then we have nothing else to load -> show a ? instead.
+      return AnimatedBitmap.new(Settings::DEFAULT_SPRITE_PATH)
+    end
+  end
+
+
+    #Always loaded from local individual sprites
+  def load_triple_fusion_sprite(dex_number)
+    sprite_path = getSpecialSpriteName(dex_number)
+    return AnimatedBitmap.new(sprite_path)
+  end
+
+  def get_sprite_extractor_instance(type)
+    case type
+    when :AUTOGEN
+      return AutogenExtracter.instance
+    when :CUSTOM
+      return CustomSpriteExtracter.instance
+    when :BASE
+      return BaseSpriteExtracter.instance
+    else
+      raise ArgumentError, "Unknown sprite type: #{type}"
+    end
+  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
+      sprite_path = "#{Settings::CUSTOM_BATTLERS_FOLDER_INDEXED}#{pif_sprite.head_id}/#{pif_sprite.head_id}.#{pif_sprite.body_id}#{pif_sprite.alt_letter}.png"
+    end
+    return pbResolveBitmap(sprite_path)
+  end
+
+  def get_pif_sprite_from_species(species)
+    substitution_id = get_sprite_substitution_id_from_dex_number(species)
+    pif_sprite = $PokemonGlobal.alt_sprite_substitutions[substitution_id] if $PokemonGlobal
+    return pif_sprite if pif_sprite
+    species_data = GameData::Species.get(species)
+    if species_data.id_number <= NB_POKEMON #base pokemon
+      return select_new_pif_base_sprite(species_data.id_number)
+    else #isFusion
+      return select_new_pif_fusion_sprite(species_data.get_head_species, species_data.get_body_species)
+    end
+  end
+
+  #
+  # Flow:
+  # #   if none found, look for custom sprite in custom spritesheet (download if can't find spritesheet or new spritepack released)
+  #   if  none found, load from autogen spritesheet
+
+  def select_new_pif_fusion_sprite(head_id, body_id)
+    species_symbol = "B#{body_id}H#{head_id}".to_sym
+    spritename = get_fusion_spritename(head_id,body_id)
+    customSpritesList = $game_temp.custom_sprites_list[species_symbol]
+    alt_letter = ""
+    if customSpritesList
+      alt_letter = get_random_alt_letter_for_custom(head_id,body_id,true)
+      type = :CUSTOM
+      type = :AUTOGEN if !alt_letter
+    else
+      type = :AUTOGEN
+    end
+    if $game_temp.forced_alt_sprites && $game_temp.forced_alt_sprites.include?(spritename)
+      alt_letter = $game_temp.forced_alt_sprites[spritename]
+    end
+    return PIFSprite.new(type, head_id, body_id, alt_letter)
+  end
+
+  def select_new_pif_base_sprite(dex_number)
+    random_alt = get_random_alt_letter_for_unfused(dex_number, true) #nil if no main
+    random_alt = "" if !random_alt
+    return PIFSprite.new(:BASE, dex_number, nil, random_alt)
+  end
+
+  #todo refactor by using get_triple_fusion_components()
+  def getSpecialSpriteName(dexNum)
+    base_path = "Graphics/Battlers/special/"
+    case dexNum
+    when Settings::ZAPMOLCUNO_NB
+      return sprintf(base_path + "144.145.146")
+    when Settings::ZAPMOLCUNO_NB + 1
+      return sprintf(base_path + "144.145.146")
+    when Settings::ZAPMOLCUNO_NB + 2
+      return sprintf(base_path + "243.244.245")
+    when Settings::ZAPMOLCUNO_NB + 3
+      return sprintf(base_path +"340.341.342")
+    when Settings::ZAPMOLCUNO_NB + 4
+      return sprintf(base_path +"343.344.345")
+    when Settings::ZAPMOLCUNO_NB + 5
+      return sprintf(base_path +"349.350.351")
+    when Settings::ZAPMOLCUNO_NB + 6
+      return sprintf(base_path +"151.251.381")
+    when Settings::ZAPMOLCUNO_NB + 11
+      return sprintf(base_path +"150.348.380")
+      #starters
+    when Settings::ZAPMOLCUNO_NB + 7
+      return sprintf(base_path +"3.6.9")
+    when Settings::ZAPMOLCUNO_NB + 8
+      return sprintf(base_path +"154.157.160")
+    when Settings::ZAPMOLCUNO_NB + 9
+      return sprintf(base_path +"278.281.284")
+    when Settings::ZAPMOLCUNO_NB + 10
+      return sprintf(base_path +"318.321.324")
+      #starters prevos
+    when Settings::ZAPMOLCUNO_NB + 12
+      return sprintf(base_path +"1.4.7")
+    when Settings::ZAPMOLCUNO_NB + 13
+      return sprintf(base_path +"2.5.8")
+    when Settings::ZAPMOLCUNO_NB + 14
+      return sprintf(base_path +"152.155.158")
+    when Settings::ZAPMOLCUNO_NB + 15
+      return sprintf(base_path +"153.156.159")
+    when Settings::ZAPMOLCUNO_NB + 16
+      return sprintf(base_path +"276.279.282")
+    when Settings::ZAPMOLCUNO_NB + 17
+      return sprintf(base_path +"277.280.283")
+    when Settings::ZAPMOLCUNO_NB + 18
+      return sprintf(base_path +"316.319.322")
+    when Settings::ZAPMOLCUNO_NB + 19
+      return sprintf(base_path +"317.320.323")
+    when Settings::ZAPMOLCUNO_NB + 20 #birdBoss Left
+      return sprintf(base_path +"invisible")
+    when Settings::ZAPMOLCUNO_NB + 21 #birdBoss middle
+      return sprintf(base_path + "144.145.146")
+    when Settings::ZAPMOLCUNO_NB + 22 #birdBoss right
+      return sprintf(base_path +"invisible")
+    when Settings::ZAPMOLCUNO_NB + 23 #sinnohboss left
+      return sprintf(base_path +"invisible")
+    when Settings::ZAPMOLCUNO_NB + 24 #sinnohboss middle
+      return sprintf(base_path +"343.344.345")
+    when Settings::ZAPMOLCUNO_NB + 25 #sinnohboss right
+      return sprintf(base_path +"invisible")
+    when Settings::ZAPMOLCUNO_NB + 25 #cardboard
+      return sprintf(base_path +"invisible")
+    when Settings::ZAPMOLCUNO_NB + 26 #cardboard
+      return sprintf(base_path + "cardboard")
+    when Settings::ZAPMOLCUNO_NB + 27 #Triple regi
+      return sprintf(base_path + "447.448.449")
+      #Triple Kalos 1
+    when Settings::ZAPMOLCUNO_NB + 28
+      return sprintf(base_path + "479.482.485")
+    when Settings::ZAPMOLCUNO_NB + 29
+      return sprintf(base_path + "480.483.486")
+    when Settings::ZAPMOLCUNO_NB + 30
+      return sprintf(base_path + "481.484.487")
+    else
+      return sprintf(base_path + "000")
+    end
+  end
+end
--- a/Data/Scripts/998_InfiniteFusion/Sprites/CustomSpriteExtracter.rb
+++ b/Data/Scripts/998_InfiniteFusion/Sprites/CustomSpriteExtracter.rb
@@ -0,0 +1,106 @@
+class CustomSpriteExtracter < PIFSpriteExtracter
+  @instance = new
+  def self.instance
+    @@instance ||= new  # If @@instance is nil, create a new instance
+    @@instance           # Return the existing or new instance
+  end
+
+  SPRITESHEET_FOLDER_PATH = "Graphics/CustomBattlers/spritesheets/spritesheets_custom/"
+  SPRITE_SIZE = 96           # Original sprite size
+  SHEET_WIDTH = SPRITE_SIZE * COLUMNS # 2880 pixels wide spritesheet
+
+  def load_bitmap_from_spritesheet(pif_sprite)
+    body_id = pif_sprite.body_id
+    spritesheet_file = getSpritesheetPath(pif_sprite)
+    spritesheet_bitmap = AnimatedBitmap.new(spritesheet_file).bitmap
+
+    sprite_x_position,sprite_y_position  =get_sprite_position_on_spritesheet(body_id,SPRITE_SIZE,COLUMNS)
+    src_rect = Rect.new(sprite_x_position, sprite_y_position, SPRITE_SIZE, SPRITE_SIZE)
+
+    sprite_bitmap = Bitmap.new(SPRITE_SIZE, SPRITE_SIZE)
+    sprite_bitmap.blt(0, 0, spritesheet_bitmap, src_rect)
+    spritesheet_bitmap.dispose  # Dispose since not needed
+
+    return sprite_bitmap
+  end
+
+  def load_sprite_to_file(pif_sprite)
+    head_id = pif_sprite.head_id
+    body_id = pif_sprite.body_id
+    alt_letter = pif_sprite.alt_letter
+    base_folder = "#{Settings::CUSTOM_BATTLERS_FOLDER_INDEXED}#{head_id}/"
+
+    individualSpriteFile = "#{base_folder}#{head_id}.#{body_id}#{alt_letter}.png"
+    if !pbResolveBitmap(individualSpriteFile)
+      animatedBitmap = load_sprite_from_spritesheet(pif_sprite)
+      Dir.mkdir(base_folder) unless Dir.exist?(base_folder)
+      animatedBitmap.bitmap.save_to_png(individualSpriteFile)
+    end
+    return AnimatedBitmap.new(individualSpriteFile)
+  end
+
+  def getSpritesheetPath(pif_sprite)
+    alt_letter = pif_sprite.alt_letter
+    head_id = pif_sprite.head_id
+    return "#{SPRITESHEET_FOLDER_PATH}#{head_id}/#{head_id}#{alt_letter}.png"
+  end
+
+  def should_update_spritesheet?(pif_sprite)
+    return false if !$updated_spritesheets
+    return false if !downloadAllowed?()
+    return false if requestRateExceeded?(Settings::CUSTOMSPRITES_RATE_LOG_FILE,Settings::CUSTOMSPRITES_ENTRIES_RATE_TIME_WINDOW,Settings::CUSTOMSPRITES_RATE_MAX_NB_REQUESTS,false)
+    spritesheet_file = getSpritesheetPath(pif_sprite)
+    return true if !pbResolveBitmap(spritesheet_file)
+    return !$updated_spritesheets.include?(spritesheet_file)
+  end
+
+
+  def load_sprite_directly(head_id,body_id,alt_letter="")
+    load_sprite(PIFSprite.new(:CUSTOM,head_id,body_id,alt_letter))
+  end
+
+
+  def get_resize_scale
+    return 3
+  end
+
+  #
+  # def extract_bitmap_to_file(head_id, body_id, alt_letter, folder)
+  #   # Create the directory if it doesn't exist
+  #   Dir.mkdir(folder) unless Dir.exist?(folder)
+  #
+  #   # Load the entire spritesheet
+  #   spritesheet_file = "#{SPRITESHEET_FOLDER_PATH}#{head_id}\\#{head_id}#{alt_letter}.png"
+  #   spritesheet_bitmap = AnimatedBitmap.new(spritesheet_file).bitmap
+  #
+  #   # Calculate the 0-based row and column from the sprite index
+  #   index = body_id
+  #   row = index / COLUMNS
+  #   col = index % COLUMNS
+  #
+  #   # Define the area of the sprite on the spritesheet
+  #   sprite_x_position = col * SPRITE_SIZE
+  #   sprite_y_position = row * SPRITE_SIZE
+  #
+  #   # Create a new bitmap for the sprite at its original size
+  #   sprite_bitmap = Bitmap.new(SPRITE_SIZE, SPRITE_SIZE)
+  #
+  #   # Copy the sprite from the spritesheet to the new bitmap
+  #   src_rect = Rect.new(sprite_x_position, sprite_y_position, SPRITE_SIZE, SPRITE_SIZE)
+  #   sprite_bitmap.blt(0, 0, spritesheet_bitmap, src_rect)
+  #
+  #   # Dispose of the spritesheet bitmap if it’s no longer needed
+  #   spritesheet_bitmap.dispose
+  #
+  #   # Save the sprite bitmap to a file
+  #   file_path = "#{folder}/#{head_id}.#{body_id}.png"
+  #   sprite_bitmap.save_to_png(file_path)
+  #
+  #   # Dispose of the sprite bitmap
+  #   sprite_bitmap.dispose
+  #
+  #   # Return the path to the saved PNG file
+  #   return file_path
+  # end
+
+end
--- a/Data/Scripts/998_InfiniteFusion/Sprites/FusionSprites.rb
+++ b/Data/Scripts/998_InfiniteFusion/Sprites/FusionSprites.rb
@@ -0,0 +1,403 @@
+module GameData
+  class Species
+    def self.sprite_bitmap_from_pokemon(pkmn, back = false, species = nil)
+      species = pkmn.species if !species
+      species = GameData::Species.get(species).id_number # Just to be sure it's a number
+      return self.egg_sprite_bitmap(species, pkmn.form) if pkmn.egg?
+      if back
+        ret = self.back_sprite_bitmap(species, pkmn.shiny?, pkmn.bodyShiny?, pkmn.headShiny?)
+      else
+        ret = self.front_sprite_bitmap(species, pkmn.shiny?, pkmn.bodyShiny?, pkmn.headShiny?)
+      end
+      ret.scale_bitmap(pkmn.sprite_scale) if ret #for pokemon with size differences
+      return ret
+    end
+
+
+
+    def self.sprite_bitmap_from_pokemon_id(id, back = false, shiny = false, bodyShiny = false, headShiny = false)
+      if back
+        ret = self.back_sprite_bitmap(id,  shiny, bodyShiny, headShiny)
+      else
+        ret = self.front_sprite_bitmap(id,  shiny, bodyShiny, headShiny)
+      end
+      return ret
+    end
+
+    MAX_SHIFT_VALUE = 360
+    MINIMUM_OFFSET = 40
+    ADDITIONAL_OFFSET_WHEN_TOO_CLOSE = 40
+    MINIMUM_DEX_DIF = 20
+
+    def self.calculateShinyHueOffset(dex_number, isBodyShiny = false, isHeadShiny = false)
+      if dex_number <= NB_POKEMON
+        if SHINY_COLOR_OFFSETS[dex_number]
+          return SHINY_COLOR_OFFSETS[dex_number]
+        end
+        body_number = dex_number
+        head_number = dex_number
+
+      else
+        body_number = getBodyID(dex_number)
+        head_number = getHeadID(dex_number, body_number)
+      end
+      if isBodyShiny && isHeadShiny && SHINY_COLOR_OFFSETS[body_number] && SHINY_COLOR_OFFSETS[head_number]
+        offset = SHINY_COLOR_OFFSETS[body_number] + SHINY_COLOR_OFFSETS[head_number]
+      elsif isHeadShiny && SHINY_COLOR_OFFSETS[head_number]
+        offset = SHINY_COLOR_OFFSETS[head_number]
+      elsif isBodyShiny && SHINY_COLOR_OFFSETS[body_number]
+        offset = SHINY_COLOR_OFFSETS[body_number]
+      else
+        offset = calculateShinyHueOffsetDefaultMethod(body_number, head_number, dex_number, isBodyShiny, isHeadShiny)
+      end
+      return offset
+    end
+
+    def self.calculateShinyHueOffsetDefaultMethod(body_number, head_number, dex_number, isBodyShiny = false, isHeadShiny = false)
+      dex_offset = dex_number
+      #body_number = getBodyID(dex_number)
+      #head_number=getHeadID(dex_number,body_number)
+      dex_diff = (body_number - head_number).abs
+      if isBodyShiny && isHeadShiny
+        dex_offset = dex_number
+      elsif isHeadShiny
+        dex_offset = head_number
+      elsif isBodyShiny
+        dex_offset = dex_diff > MINIMUM_DEX_DIF ? body_number : body_number + ADDITIONAL_OFFSET_WHEN_TOO_CLOSE
+      end
+      offset = dex_offset + Settings::SHINY_HUE_OFFSET
+      offset /= MAX_SHIFT_VALUE if offset > NB_POKEMON
+      offset = MINIMUM_OFFSET if offset < MINIMUM_OFFSET
+      offset = MINIMUM_OFFSET if (MAX_SHIFT_VALUE - offset).abs < MINIMUM_OFFSET
+      offset += pbGet(VAR_SHINY_HUE_OFFSET) #for testing - always 0 during normal gameplay
+      return offset
+    end
+
+    def self.getAutogenSprite(head_id, body_id)
+
+    end
+
+
+  # species can be either a number, a Species objet of a symbol
+    def self.front_sprite_bitmap(species, isShiny = false, bodyShiny = false, headShiny = false)
+      dex_number = getDexNumberForSpecies(species)
+      if species.is_a?(Species)
+        dex_number = species.id_number
+      end
+
+      spriteLoader = BattleSpriteLoader.new
+      if isFusion(dex_number)
+        body_id = getBodyID(dex_number)
+        head_id = getHeadID(dex_number, body_id)
+        sprite = spriteLoader.load_fusion_sprite(head_id,body_id)
+      else
+        if isTripleFusion?(dex_number)
+          sprite = spriteLoader.load_triple_fusion_sprite(dex_number)
+        else
+          sprite = spriteLoader.load_base_sprite(dex_number)
+        end
+      end
+      if isShiny
+        sprite.shiftColors(self.calculateShinyHueOffset(dex_number, bodyShiny, headShiny))
+      end
+      return sprite
+    end
+
+
+
+
+
+
+    # def self.front_sprite_bitmap(dex_number, isShiny = false, bodyShiny = false, headShiny = false)
+    #   # body_id = getBodyID(dex_number)
+    #   # head_id = getHeadID(dex_number, body_id)
+    #   # return getAutogenSprite(head_id,body_id)
+    #
+    #   #la méthode est utilisé ailleurs avec d'autres arguments (gender, form, etc.) mais on les veut pas
+    #   if dex_number.is_a?(Symbol)
+    #     dex_number = GameData::Species.get(dex_number).id_number
+    #   end
+    #   filename = self.sprite_filename(dex_number)
+    #   sprite = (filename) ? AnimatedBitmap.new(filename) : nil
+    #   if isShiny
+    #     sprite.shiftColors(self.calculateShinyHueOffset(dex_number, bodyShiny, headShiny))
+    #   end
+    #   return sprite
+    # end
+
+    def self.back_sprite_bitmap(dex_number, isShiny = false, bodyShiny = false, headShiny = false)
+      # filename = self.sprite_filename(dex_number)
+      # sprite = (filename) ? AnimatedBitmap.new(filename) : nil
+      # if isShiny
+      #   sprite.shiftColors(self.calculateShinyHueOffset(dex_number, bodyShiny, headShiny))
+      # end
+      # return sprite
+      sprite = self.front_sprite_bitmap(dex_number,isShiny,bodyShiny,headShiny)
+      return sprite#.mirror
+    end
+
+    def self.egg_sprite_bitmap(dex_number, form = nil)
+      filename = self.egg_sprite_filename(dex_number, form)
+      return (filename) ? AnimatedBitmap.new(filename) : nil
+    end
+  end
+end
+
+
+    # def self.sprite_filename(dex_number)
+    #   #dex_number = GameData::NAT_DEX_MAPPING[dex_number] ? GameData::NAT_DEX_MAPPING[dex_number] : dex_number
+    #   if dex_number.is_a?(GameData::Species)
+    #     dex_number = dex_number.id_number
+    #   end
+    #   if dex_number.is_a?(Symbol)
+    #     dex_number = getDexNumberForSpecies(dex_number)
+    #   end
+    #   return nil if dex_number == nil
+    #   if dex_number <= Settings::NB_POKEMON
+    #     return get_unfused_sprite_path(dex_number)
+    #   else
+    #     if dex_number >= Settings::ZAPMOLCUNO_NB
+    #       specialPath = getSpecialSpriteName(dex_number)
+    #       return pbResolveBitmap(specialPath)
+    #       head_id = nil
+    #     else
+    #       body_id = getBodyID(dex_number)
+    #       head_id = getHeadID(dex_number, body_id)
+    #       return get_fusion_sprite_path(head_id, body_id)
+    #       # folder = head_id.to_s
+    #       # filename = sprintf("%s.%s.png", head_id, body_id)
+    #     end
+    #   end
+    #   # customPath = pbResolveBitmap(Settings::CUSTOM_BATTLERS_FOLDER_INDEXED + "/" + head_id.to_s + "/" +filename)
+    #   # customPath = download_custom_sprite(head_id,body_id)
+    #   #
+    #   # species = getSpecies(dex_number)
+    #   # use_custom = customPath && !species.always_use_generated
+    #   # if use_custom
+    #   #   return customPath
+    #   # end
+    #   # #return Settings::BATTLERS_FOLDER + folder + "/" + filename
+    #   # return download_autogen_sprite(head_id,body_id)
+    # end
+
+
+# def get_unfused_sprite_path(dex_number_id, localOnly = false)
+#   dex_number = dex_number_id.to_s
+#   folder = dex_number.to_s
+#   substitution_id = _INTL("{1}", dex_number)
+#
+#   if alt_sprites_substitutions_available && $PokemonGlobal.alt_sprite_substitutions.keys.include?(substitution_id)
+#     substitutionPath = $PokemonGlobal.alt_sprite_substitutions[substitution_id]
+#     return substitutionPath if pbResolveBitmap(substitutionPath)
+#   end
+#   random_alt = get_random_alt_letter_for_unfused(dex_number, true) #nil if no main
+#   random_alt = "" if !random_alt || localOnly
+#
+#
+#   filename = _INTL("{1}{2}.png", dex_number,random_alt)
+#
+#   path = Settings::CUSTOM_BASE_SPRITES_FOLDER  + filename
+#   if pbResolveBitmap(path)
+#     record_sprite_substitution(substitution_id,path)
+#     return path
+#   end
+#   echoln "downloading main sprite #{filename}"
+#   downloaded_path = download_unfused_main_sprite(dex_number, random_alt) if !localOnly
+#   if pbResolveBitmap(downloaded_path)
+#     record_sprite_substitution(substitution_id,downloaded_path)
+#     return downloaded_path
+#   end
+#   return path
+# end
+
+def alt_sprites_substitutions_available
+  return $PokemonGlobal && $PokemonGlobal.alt_sprite_substitutions
+end
+
+def print_stack_trace
+  stack_trace = caller
+  stack_trace.each_with_index do |call, index|
+    echo("#{index + 1}: #{call}")
+  end
+end
+
+# def record_sprite_substitution(substitution_id, sprite_name)
+#   return if !$PokemonGlobal
+#   return if !$PokemonGlobal.alt_sprite_substitutions
+#   $PokemonGlobal.alt_sprite_substitutions[substitution_id] = sprite_name
+# end
+
+def add_to_autogen_cache(pokemon_id, sprite_name)
+  return if !$PokemonGlobal
+  return if !$PokemonGlobal.autogen_sprites_cache
+  $PokemonGlobal.autogen_sprites_cache[pokemon_id]=sprite_name
+end
+
+class PokemonGlobalMetadata
+  attr_accessor :autogen_sprites_cache
+end
+
+#To force a specific sprites before a battle
+#
+#  ex:
+# $PokemonTemp.forced_alt_sprites={"20.25" => "20.25a"}
+#
+class PokemonTemp
+  attr_accessor :forced_alt_sprites
+end
+
+#todo:
+# DO NOT USE ANYMORE
+# Replace by BattleSpriteLoader
+# def get_fusion_sprite_path(head_id, body_id, localOnly=false)
+#   $PokemonGlobal.autogen_sprites_cache = {} if $PokemonGlobal && !$PokemonGlobal.autogen_sprites_cache
+#   #Todo: ça va chier si on fusionne une forme d'un pokemon avec une autre forme, mais pas un problème pour tout de suite
+#   form_suffix = ""
+#
+#   #Swap path if alt is selected for this pokemon
+#   dex_num = getSpeciesIdForFusion(head_id, body_id)
+#   substitution_id = dex_num.to_s + form_suffix
+#
+#   if alt_sprites_substitutions_available && $PokemonGlobal.alt_sprite_substitutions.keys.include?(substitution_id)
+#     substitutionPath= $PokemonGlobal.alt_sprite_substitutions[substitution_id]
+#     return substitutionPath if pbResolveBitmap(substitutionPath)
+#   end
+#
+#
+#   pokemon_name = _INTL("{1}.{2}",head_id, body_id)
+#
+#   #get altSprite letter
+#   random_alt = get_random_alt_letter_for_custom(head_id, body_id) #nil if no main
+#   random_alt = "" if !random_alt
+#   forcingSprite=false
+#   if $PokemonTemp.forced_alt_sprites && $PokemonTemp.forced_alt_sprites.key?(pokemon_name)
+#     random_alt = $PokemonTemp.forced_alt_sprites[pokemon_name]
+#     forcingSprite=true
+#   end
+#
+#
+#   filename = _INTL("{1}{2}.png", pokemon_name, random_alt)
+#   #Try local custom sprite
+#   local_custom_path = Settings::CUSTOM_BATTLERS_FOLDER_INDEXED + head_id.to_s  + "/" + filename
+#   if pbResolveBitmap(local_custom_path)
+#     record_sprite_substitution(substitution_id, local_custom_path) if !forcingSprite
+#     return local_custom_path
+#   end
+#   #if the game has loaded an autogen earlier, no point in trying to redownload, so load that instead
+#   return $PokemonGlobal.autogen_sprites_cache[substitution_id] if  $PokemonGlobal && $PokemonGlobal.autogen_sprites_cache[substitution_id]
+#
+#   #Try to download custom sprite if none found locally
+#   downloaded_custom = download_custom_sprite(head_id, body_id, random_alt) if !localOnly
+#   if downloaded_custom
+#     record_sprite_substitution(substitution_id, downloaded_custom) if !forcingSprite
+#     return downloaded_custom
+#   end
+#
+#   #Try local generated sprite
+#   local_generated_path = Settings::BATTLERS_FOLDER + head_id.to_s  + "/" + filename
+#   if pbResolveBitmap(local_generated_path)
+#     add_to_autogen_cache(substitution_id,local_generated_path)
+#     return local_generated_path
+#   end
+#
+#   #Download generated sprite if nothing else found
+#   autogen_path = download_autogen_sprite(head_id, body_id) if !localOnly
+#   if pbResolveBitmap(autogen_path)
+#     add_to_autogen_cache(substitution_id,autogen_path)
+#     return autogen_path
+#   end
+#
+#   return Settings::DEFAULT_SPRITE_PATH
+# end
+
+def get_random_alt_letter_for_custom(head_id, body_id, onlyMain = true)
+  spriteName = _INTL("{1}.{2}", head_id, body_id)
+  echoln spriteName
+  if onlyMain
+    alts_list = list_main_sprites_letters(spriteName)
+    return nil if alts_list.empty?
+    return alts_list.sample
+  else
+    alts_list = list_all_sprites_letters(spriteName)
+    return nil if alts_list.empty?
+    return alts_list.sample
+  end
+end
+
+def get_random_alt_letter_for_unfused(dex_num, onlyMain = true)
+  spriteName = _INTL("{1}", dex_num)
+  if onlyMain
+    letters_list= list_main_sprites_letters(spriteName)
+  else
+    letters_list= list_all_sprites_letters(spriteName)
+  end
+  letters_list << ""  #add main sprite
+  return letters_list.sample
+end
+
+def list_main_sprites_letters(spriteName)
+  all_sprites = map_alt_sprite_letters_for_pokemon(spriteName)
+  main_sprites = []
+  all_sprites.each do |key, value|
+    main_sprites << key if value == "main"
+  end
+
+  #add temp sprites if no main sprites found
+  if main_sprites.empty?
+    all_sprites.each do |key, value|
+      main_sprites << key if value == "temp"
+    end
+  end
+  return main_sprites
+end
+
+def list_all_sprites_letters_head_body(head_id,body_id)
+  spriteName = _INTL("{1}.{2}", head_id, body_id)
+  all_sprites_map = map_alt_sprite_letters_for_pokemon(spriteName)
+  letters = []
+  all_sprites_map.each do |key, value|
+    letters << key
+  end
+  return letters
+end
+
+def list_all_sprites_letters(spriteName)
+  all_sprites_map = map_alt_sprite_letters_for_pokemon(spriteName)
+  letters = []
+  all_sprites_map.each do |key, value|
+    letters << key
+  end
+  return letters
+end
+
+def list_alt_sprite_letters(spriteName)
+  all_sprites = map_alt_sprite_letters_for_pokemon(spriteName)
+  alt_sprites = []
+  all_sprites.each do |key, value|
+    alt_sprites << key if value == "alt"
+  end
+end
+
+
+#ex: "1" -> "main"
+#    "1a" -> "alt"
+def map_alt_sprite_letters_for_pokemon(spriteName)
+  alt_sprites = {}
+  File.foreach(Settings::CREDITS_FILE_PATH) do |line|
+    row = line.split(',')
+    sprite_name = row[0]
+    if sprite_name.start_with?(spriteName)
+      if sprite_name.length > spriteName.length #alt letter
+        letter = sprite_name[spriteName.length]
+        if letter.match?(/[a-zA-Z]/)
+          main_or_alt = row[2] ? row[2] : nil
+          alt_sprites[letter] = main_or_alt
+        end
+      else  #letterless
+      main_or_alt = row[2] ? row[2].gsub("\n","") : nil
+      alt_sprites[""] = main_or_alt
+      end
+    end
+  end
+  return alt_sprites
+end
--- a/Data/Scripts/998_InfiniteFusion/Sprites/Overrides/PIF_PokemonSprites.rb
+++ b/Data/Scripts/998_InfiniteFusion/Sprites/Overrides/PIF_PokemonSprites.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class PokemonSprite
+
+  def setPokemonBitmapFromId(id, back = false, shiny = false, bodyShiny = false, headShiny = false,spriteform_body=nil,spriteform_head=nil)
+    @_iconbitmap.dispose if @_iconbitmap
+    @_iconbitmap = GameData::Species.sprite_bitmap_from_pokemon_id(id, back, shiny, bodyShiny, headShiny)
+    self.bitmap = (@_iconbitmap) ? @_iconbitmap.bitmap : nil
+    self.color = Color.new(0, 0, 0, 0)
+    changeOrigin
+  end
+
+end
--- a/Data/Scripts/998_InfiniteFusion/Sprites/PIFSprite.rb
+++ b/Data/Scripts/998_InfiniteFusion/Sprites/PIFSprite.rb
@@ -0,0 +1,114 @@
+# object representing a sprite which saves its position in the tileset
+class PIFSprite
+  attr_accessor :type
+  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 = "")
+    @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 exists()
+    filename = get_spritesheet_path()
+    echoln filename
+    return File.file?(filename)
+  end
+
+  def get_spritesheet_path()
+    case @type
+    when :BASE
+      path = "#{BaseSpriteExtracter::SPRITESHEET_FOLDER_PATH}#{@head_id}.png"
+    when :CUSTOM
+      path = "#{CustomSpriteExtracter::SPRITESHEET_FOLDER_PATH}#{@head_id}/#{@head_id}#{@alt_letter}.png"
+    when :AUTOGEN
+      path = "#{AutogenExtracter::SPRITESHEET_FOLDER_PATH}#{@head_id}.png"
+    else
+      return nil
+    end
+    echoln path
+    return path
+  end
+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()
+  case @type
+  when :CUSTOM
+    return "#{@head_id}.#{@body_id}#{@alt_letter}.png"
+  when :AUTOGEN
+    return "#{@head_id}.#{@body_id}.png"
+  when :BASE
+    return "#{@head_id}#{@alt_letter}.png"
+  end
+end
+
+def setup_from_spritename(spritename, type)
+  @type = type
+  cleaned_name = spritename.gsub(".png", "")
+  if cleaned_name =~ /(\d+)\.(\d+)([a-zA-Z]*)/
+    head_id = $1
+    body_id = $2
+    alt_letter = $3
+  end
+  @head_id = head_id
+  @body_id = body_id
+  @alt_letter = alt_letter
+end
+
+def self.from_spritename(spritename, type)
+  obj = allocate
+  obj.send(:setup_from_spritename, spritename, type)
+  obj
+end
+
+
+
+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)
+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
+    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")
+
+  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")
+  else
+    echoln "Invalid sprite format: #{spritename}"
+    return nil
+  end
+  type = :AUTOGEN if autogen
+  return PIFSprite.new(type, head_id, body_id, alt_letter)
+end
--- a/Data/Scripts/998_InfiniteFusion/Sprites/SpritesSubstitutions.rb
+++ b/Data/Scripts/998_InfiniteFusion/Sprites/SpritesSubstitutions.rb
@@ -0,0 +1,82 @@
+def setSpriteSubstitution(pif_sprite); end
+def getSpriteSubstitutionForDex(dex_num); end
+def setSpriteSubstitution(head,body); end
+def set_updated_spritesheets; end
+
+
+class PokemonGlobalMetadata
+  attr_accessor :alt_sprite_substitutions
+end
+
+def initialize_alt_sprite_substitutions()
+  $PokemonGlobal.alt_sprite_substitutions = {} if !$PokemonGlobal.alt_sprite_substitutions
+  migrate_sprites_substitutions()
+end
+
+def get_sprite_substitution_id_for_fusion(head_id, body_id)
+  species_symbol = "B#{body_id}H#{head_id}".to_sym
+  return get_sprite_substitution_id_from_dex_number(species_symbol)
+end
+
+def get_sprite_substitution_id_from_dex_number(species_symbol)
+  species = GameData::Species.get(species_symbol)
+  if species.is_fusion
+    substitution_id = [species.get_head_species,species.get_body_species]
+  else
+    substitution_id= species.id_number
+  end
+  return substitution_id
+end
+
+def migrate_sprites_substitutions
+  return if $game_switches[SWITCH_UPDATED_TO_SPRITESHEETS_SPRITES]
+  new_substitutions = {}
+  old_number_pokemon = 470
+  for dex_number_key in $PokemonGlobal.alt_sprite_substitutions.keys
+    if $PokemonGlobal.alt_sprite_substitutions[dex_number_key].is_a?(String) && can_convert_to_int?(dex_number_key)
+      old_dex_number = dex_number_key.to_i
+      if old_dex_number > old_number_pokemon #fusion
+        body_id = getBodyID(old_dex_number,old_number_pokemon)
+        head_id = getHeadID(old_dex_number,body_id,old_number_pokemon)
+        new_id = [head_id,body_id]
+        type = :CUSTOM
+      else
+        new_id = old_dex_number
+        head_id = old_dex_number
+        body_id= nil
+        type = :BASE
+      end
+      file_path = $PokemonGlobal.alt_sprite_substitutions[dex_number_key]
+      alt_letter =get_alt_letter_from_path(file_path)
+
+      pif_sprite = PIFSprite.new(type,head_id,body_id,alt_letter)
+      new_substitutions[new_id] = pif_sprite
+    end
+  end
+  $PokemonGlobal.alt_sprite_substitutions = new_substitutions
+  $game_switches[SWITCH_UPDATED_TO_SPRITESHEETS_SPRITES] = true
+end
+
+def can_convert_to_int?(str)
+  Integer(str)
+  true
+rescue ArgumentError
+  false
+end
+
+def get_alt_letter_from_path(filename)
+    # Remove the extension
+    base_name = filename.sub(/\.png$/, '')
+
+    # Check the last character
+    last_char = base_name[-1]
+
+    if last_char.match?(/\d/) # Check if the last character is a number
+      alt_letter = ""
+    else
+      # Reverse the base name and capture all letters until the first number
+      alt_letter = base_name.reverse[/[a-zA-Z]+/].reverse
+    end
+
+    return alt_letter
+end