pokedex

Data/Scripts/001_Settings.rb

@@ -216,9 +216,7 @@ module Settings
   # Dex list, no matter which region the player is currently in.
   def self.pokedex_names
     return [
-      [_INTL("Kanto Pokédex"), 0],
+      [_INTL("Kanto Pokédex"), 0]
-      [_INTL("Johto Pokédex"), 1],
-      _INTL("National Pokédex")
     ]
   end
   # Whether all forms of a given species will be immediately available to view

Data/Scripts/010_Data/002_PBS data/009_Species_Files.rb

@@ -64,7 +64,8 @@ module GameData
     end
 
     def self.front_sprite_bitmap(species, form = 0, gender = 0, shiny = false, shadow = false)
-      filename = self.front_sprite_filename(species, form, gender, shiny, shadow)
+      #filename = self.front_sprite_filename(species, form, gender, shiny, shadow)
+      filename = self.front_sprite_filename(GameData::Species.get(species).id_number)
       return (filename) ? AnimatedBitmap.new(filename) : nil
     end
 

Data/Scripts/016_UI/003_UI_Pokedex_Main.rb

@@ -312,29 +312,46 @@ class PokemonPokedex_Scene
     return true   # For MODENUMERICAL
   end
 
-  def pbGetDexList
+  # def pbGetDexList
-    region = pbGetPokedexRegion
+  #   region = pbGetPokedexRegion
-    regionalSpecies = pbAllRegionalSpecies(region)
+  #   regionalSpecies = pbAllRegionalSpecies(region)
-    if !regionalSpecies || regionalSpecies.length == 0
+  #   if !regionalSpecies || regionalSpecies.length == 0
-      # If no Regional Dex defined for the given region, use the National Pokédex
+  #     # If no Regional Dex defined for the given region, use the National Pokédex
-      regionalSpecies = []
+  #     regionalSpecies = []
-      GameData::Species.each { |s| regionalSpecies.push(s.id) if s.form == 0 }
+  #     GameData::Species.each { |s| regionalSpecies.push(s.id) if s.form == 0 }
+  #   end
+  #   shift = Settings::DEXES_WITH_OFFSETS.include?(region)
+  #   ret = []
+  #   regionalSpecies.each_with_index do |species, i|
+  #     next if !species
+  #     next if !pbCanAddForModeList?($PokemonGlobal.pokedexMode, species)
+  #     species_data = GameData::Species.get(species)
+  #     color  = species_data.color
+  #     type1  = species_data.type1
+  #     type2  = species_data.type2 || type1
+  #     shape  = species_data.shape
+  #     height = species_data.height
+  #     weight = species_data.weight
+  #     ret.push([species, species_data.name, height, weight, i + 1, shift, type1, type2, color, shape])
+  #   end
+  #   return ret
+  # end
+
+
+  def pbGetDexList()
+    dexlist=[]
+    regionalSpecies=[]
+    for i in 1..PBSpecies.maxValue
+      regionalSpecies.push(i)
     end
-    shift = Settings::DEXES_WITH_OFFSETS.include?(region)
+    for i in 1...PBSpecies.maxValue
-    ret = []
+      nationalSpecies=i
-    regionalSpecies.each_with_index do |species, i|
+      if $Trainer.seen?(nationalSpecies)
-      next if !species
+        species = GameData::Species.get(nationalSpecies)
-      next if !pbCanAddForModeList?($PokemonGlobal.pokedexMode, species)
+        dexlist.push([species.id_number,species.real_name,0,0,i+1,0])
-      species_data = GameData::Species.get(species)
+      end
-      color  = species_data.color
-      type1  = species_data.type1
-      type2  = species_data.type2 || type1
-      shape  = species_data.shape
-      height = species_data.height
-      weight = species_data.weight
-      ret.push([species, species_data.name, height, weight, i + 1, shift, type1, type2, color, shape])
     end
-    return ret
+    return dexlist
   end
 
   def pbRefreshDexList(index=0)

Data/Scripts/050_AddOns/FusionSprites.rb

@@ -21,7 +21,10 @@ module GameData
       return ret
     end
 
-    def self.front_sprite_bitmap(dex_number)
+    def self.front_sprite_bitmap(dex_number,a=0,b=0,c=0,d=0)  #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)
       return (filename) ? AnimatedBitmap.new(filename) : nil
     end
@@ -37,6 +40,7 @@ module GameData
     end
 
     def self.sprite_filename(dex_number)
+      return nil if dex_number == nil
       if dex_number <= Settings::NB_POKEMON
         folder = dex_number.to_s
         filename = sprintf("%s.png", dex_number)