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 aa34e5699..069b904f5 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 b389ed0e3..65a305717 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/MapInfos.rxdata b/Data/MapInfos.rxdata
index 0b63773cb..6d90655ad 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/050_AddOns/Gen 2.rb b/Data/Scripts/050_AddOns/Gen 2.rb
index bce13f4b8..de40ac466 100644
--- a/Data/Scripts/050_AddOns/Gen 2.rb	
+++ b/Data/Scripts/050_AddOns/Gen 2.rb	
@@ -130,6 +130,7 @@ end
 
 #in: pokemon number
 def Kernel.isPartPokemon(src, target)
+
   src = getDexNumberForSpecies(src)
   target = getDexNumberForSpecies(target)
   return true if src == target
@@ -150,6 +151,8 @@ def getBasePokemonID(pokemon, body = true)
     pokemon = dex_number
   end
   return nil if pokemon <= 0
+  return nil if pokemon >= Settings::ZAPMOLCUNO_NB
+
   # cname = getConstantName(PBSpecies, pokemon) rescue nil
   cname = GameData::Species.get(pokemon).id.to_s
   return pokemon if pokemon <= NB_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 bc93b347d..649f42151 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index 05045e8ca..646a60fd7 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