Various bugfixes

Data/Scripts/050_AddOns/GeneralUtils.rb

@@ -161,7 +161,7 @@ end
 
 
 def addShinyStarsToGraphicsArray(imageArray, xPos, yPos, shinyBody, shinyHead, debugShiny, srcx=nil, srcy=nil, width=nil, height=nil,
-                                 showSecondStarUnder=false, showSecondStarAbove=false)
+                                 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
@@ -174,6 +174,10 @@ def addShinyStarsToGraphicsArray(imageArray, xPos, yPos, shinyBody, shinyHead, d
     end
     imageArray.push(["Graphics/Pictures/shiny",xPos,yPos,srcx,srcy,width,height,color])
   end
+  # if onlyOutline
+  #   imageArray.push(["Graphics/Pictures/shiny_black",xPos,yPos,srcx,srcy,width,height,color])
+  # end
+
 end
 
 def getRandomCustomFusion(returnRandomPokemonIfNoneFound = true, customPokeList = [], maxPoke = -1, recursionLimit = 3, maxBST=300)
@@ -369,9 +373,14 @@ end
 def obtainPokemonSpritePath(id, includeCustoms = true)
   head = getBasePokemonID(param.to_i, false)
   body = getBasePokemonID(param.to_i, true)
+
   return obtainPokemonSpritePath(body, head, includeCustoms)
 end
 
+
+
+
+
 def obtainPokemonSpritePath(bodyId, headId, include_customs = true)
   picturePath = _INTL("Graphics/Battlers/{1}/{1}.{2}.png", headId, bodyId)
 

Data/Scripts/050_AddOns/PokedexUtils.rb

@@ -0,0 +1,48 @@
+class PokedexUtils
+  POSSIBLE_ALTS = %w[a b c d e f g h i j k x]
+
+  def pbGetAvailableAlts(species)
+    ret = []
+    return ret if !species
+    dexNum = getDexNumberForSpecies(species)
+    isFusion = dexNum > NB_POKEMON
+    if !isFusion
+      ret << Settings::BATTLERS_FOLDER + dexNum.to_s + "/" + dexNum.to_s + ".png"
+      return ret
+    end
+    body_id = getBodyID(species)
+    head_id = getHeadID(species, body_id)
+
+    baseFilename = head_id.to_s + "." + body_id.to_s
+    baseFilePath = Settings::CUSTOM_BATTLERS_FOLDER_INDEXED + "/" + head_id.to_s + "/" + baseFilename + ".png"
+    if pbResolveBitmap(baseFilePath)
+      ret << baseFilePath
+    end
+    POSSIBLE_ALTS.each { |alt_letter|
+      altFilePath = Settings::CUSTOM_BATTLERS_FOLDER_INDEXED  + "/" + head_id.to_s + "/" + baseFilename + alt_letter + ".png"
+      if pbResolveBitmap(altFilePath)
+        ret << altFilePath
+      end
+    }
+    ret << Settings::BATTLERS_FOLDER + head_id.to_s + "/" + baseFilename + ".png"
+    return ret
+  end
+
+
+  #todo: return array for split evolution lines that have multiple final evos
+  def getFinalEvolution(species)
+    #ex: [[B3H4,Level 32],[B2H5, Level 35]]
+    evolution_line = species.get_evolutions
+    return species if evolution_line.empty?
+    finalEvoId = evolution_line[0][0]
+    return evolution_line[]
+    for evolution in evolution_line
+      evoSpecies = evolution[0]
+      p GameData::Species.get(evoSpecies).get_evolutions
+      isFinalEvo = GameData::Species.get(evoSpecies).get_evolutions.empty?
+      return evoSpecies if isFinalEvo
+    end
+    return nil
+  end
+
+end

Data/Scripts/050_AddOns/UI_Pokedex_SpritesPage.rb

@@ -92,10 +92,9 @@ class PokemonPokedexInfo_Scene
 
   end
 
-  POSSIBLE_ALTS = %w[a b c d e f g h i j k x]
 
   def pbGetAvailableForms
-    return pbGetAvailableAlts
+    return PokedexUtils.new.pbGetAvailableAlts(@species)
   end
 
   def hide_all_selected_windows
@@ -134,32 +133,7 @@ class PokemonPokedexInfo_Scene
     update_selected
   end
 
-  def pbGetAvailableAlts
-    ret = []
-    return ret if !@species
-    dexNum = getDexNumberForSpecies(@species)
-    isFusion = dexNum > NB_POKEMON
-    if !isFusion
-      ret << Settings::BATTLERS_FOLDER + dexNum.to_s + "/" + dexNum.to_s + ".png"
-      return ret
-    end
-    body_id = getBodyID(@species)
-    head_id = getHeadID(@species, body_id)
 
-    baseFilename = head_id.to_s + "." + body_id.to_s
-    baseFilePath = Settings::CUSTOM_BATTLERS_FOLDER_INDEXED + "/" + head_id.to_s + "/" + baseFilename + ".png"
-    if pbResolveBitmap(baseFilePath)
-      ret << baseFilePath
-    end
-    POSSIBLE_ALTS.each { |alt_letter|
-      altFilePath = Settings::CUSTOM_BATTLERS_FOLDER_INDEXED  + "/" + head_id.to_s + "/" + baseFilename + alt_letter + ".png"
-      if pbResolveBitmap(altFilePath)
-        ret << altFilePath
-      end
-    }
-    ret << Settings::BATTLERS_FOLDER + head_id.to_s + "/" + baseFilename + ".png"
-    return ret
-  end
 
   def pbChooseForm
     loop do