fixes pbHasSpecies method (which is used in a bunch of events)

Data/Scripts/019_Utilities/001_Utilities.rb

@@ -100,16 +100,16 @@ def getConst(mod,constant)
 end
 
 # Unused
-def getID(mod,constant)
+# def getID(mod,constant)
-  return nil if !mod || constant.nil?
+#   return nil if !mod || constant.nil?
-  if constant.is_a?(Symbol) || constant.is_a?(String)
+#   if constant.is_a?(Symbol) || constant.is_a?(String)
-    if (mod.const_defined?(constant.to_sym) rescue false)
+#     if (mod.const_defined?(constant.to_sym) rescue false)
-      return mod.const_get(constant.to_sym) rescue 0
+#       return mod.const_get(constant.to_sym) rescue 0
-    end
+#     end
-    return 0
+#     return 0
-  end
+#   end
-  return constant
+#   return constant
-end
+# end
 
 def getConstantName(mod,value)
   mod = Object.const_get(mod) if mod.is_a?(Symbol)

Data/Scripts/050_AddOns/GeneralUtils.rb

@@ -50,15 +50,28 @@ end
 
 def pbHasSpecies?(species)
   if species.is_a?(String) || species.is_a?(Symbol)
-    species = getID(PBSpecies, species)
+    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.species == species
+    return true if pokemon.dexNum == id
   end
   return false
 end
 
+
+#ancienne methode qui est encore callée un peu partout dans les vieux scripts
+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
 #Check if the Pokemon can learn a TM
 def CanLearnMove(pokemon, move)
   species = getID(PBSpecies, pokemon)