diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata
index 7967a5432..41edc8e26 100644
Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ
diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata
index 8e67182ba..826e1e8a6 100644
Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ
diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata
index 2249bec14..901f2bb2b 100644
Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ
diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index ea674da30..e51360759 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata
index 004ee903d..be622f513 100644
Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ
diff --git a/Data/Items.rxdata b/Data/Items.rxdata
index 3e62ba6d2..fe767fa0b 100644
Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ
diff --git a/Data/Map319.rxdata b/Data/Map319.rxdata
index 6db039d10..33e51edc7 100644
Binary files a/Data/Map319.rxdata and b/Data/Map319.rxdata differ
diff --git a/Data/Map531.rxdata b/Data/Map531.rxdata
index 7be7410da..2e950bb84 100644
Binary files a/Data/Map531.rxdata and b/Data/Map531.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index e251f526b..c8e842204 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/019_Utilities/001_Utilities.rb b/Data/Scripts/019_Utilities/001_Utilities.rb
index 8397dae57..76428547d 100644
--- a/Data/Scripts/019_Utilities/001_Utilities.rb
+++ b/Data/Scripts/019_Utilities/001_Utilities.rb
@@ -100,16 +100,16 @@ def getConst(mod,constant)
 end
 
 # Unused
-def getID(mod,constant)
-  return nil if !mod || constant.nil?
-  if constant.is_a?(Symbol) || constant.is_a?(String)
-    if (mod.const_defined?(constant.to_sym) rescue false)
-      return mod.const_get(constant.to_sym) rescue 0
-    end
-    return 0
-  end
-  return constant
-end
+# def getID(mod,constant)
+#   return nil if !mod || constant.nil?
+#   if constant.is_a?(Symbol) || constant.is_a?(String)
+#     if (mod.const_defined?(constant.to_sym) rescue false)
+#       return mod.const_get(constant.to_sym) rescue 0
+#     end
+#     return 0
+#   end
+#   return constant
+# end
 
 def getConstantName(mod,value)
   mod = Object.const_get(mod) if mod.is_a?(Symbol)
diff --git a/Data/Scripts/050_AddOns/GeneralUtils.rb b/Data/Scripts/050_AddOns/GeneralUtils.rb
index a42c41370..77b582969 100644
--- a/Data/Scripts/050_AddOns/GeneralUtils.rb
+++ b/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)
diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata
index 61cba7ea2..a45219f5e 100644
Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ
diff --git a/Data/States.rxdata b/Data/States.rxdata
index 0f9b4ae5d..868d49e59 100644
Binary files a/Data/States.rxdata and b/Data/States.rxdata differ
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 579d8e40d..5df294767 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index 8d34a0eef..9873e9ae6 100644
Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ
diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata
index d9bd35260..c7ea19a7a 100644
Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ