diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata
index 41edc8e26..7967a5432 100644
Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ
diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata
index 826e1e8a6..8e67182ba 100644
Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ
diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata
index 901f2bb2b..2249bec14 100644
Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ
diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index 9fd764e7d..71c6de4dc 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata
index be622f513..004ee903d 100644
Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ
diff --git a/Data/Items.rxdata b/Data/Items.rxdata
index fe767fa0b..3e62ba6d2 100644
Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 42c782641..5f209731c 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/011_Battle/002_Move/006_Move_Effects_080-0FF.rb b/Data/Scripts/011_Battle/002_Move/006_Move_Effects_080-0FF.rb
index 2f8102053..18ce706cf 100644
--- a/Data/Scripts/011_Battle/002_Move/006_Move_Effects_080-0FF.rb
+++ b/Data/Scripts/011_Battle/002_Move/006_Move_Effects_080-0FF.rb
@@ -243,13 +243,13 @@ end
 #===============================================================================
 class PokeBattle_Move_090 < PokeBattle_Move
   def pbBaseType(user)
-    hp = pbHiddenPower(user,user.hiddenPowerType)
+    hp = pbHiddenPower(user,user.pokemon.hiddenPowerType)
     return hp[0]
   end
 
   def pbBaseDamage(baseDmg,user,target)
     return super if Settings::MECHANICS_GENERATION >= 6
-    hp = pbHiddenPower(user,user.hiddenPowerType)
+    hp = pbHiddenPower(user,user.pokemon.hiddenPowerType)
     return hp[1]
   end
 end
diff --git a/Data/Scripts/019_Utilities/002_Utilities_Pokemon.rb b/Data/Scripts/019_Utilities/002_Utilities_Pokemon.rb
index 0b5c10358..e53b32bd6 100644
--- a/Data/Scripts/019_Utilities/002_Utilities_Pokemon.rb
+++ b/Data/Scripts/019_Utilities/002_Utilities_Pokemon.rb
@@ -137,7 +137,7 @@ def pbAddForeignPokemon(pkmn, level = 1, owner_name = nil, nickname = nil, owner
 end
 
 def pbGenerateEgg(pkmn, text = "")
-  return false if !pkmn || $Trainer.party_full?
+  return false if !pkmn #|| $Trainer.party_full?
   pkmn = Pokemon.new(pkmn, Settings::EGG_LEVEL) if !pkmn.is_a?(Pokemon)
   # Set egg's details
   pkmn.name           = _INTL("Egg")
@@ -145,7 +145,12 @@ def pbGenerateEgg(pkmn, text = "")
   pkmn.obtain_text    = text
   pkmn.calc_stats
   # Add egg to party
-  $Trainer.party[$Trainer.party.length] = pkmn
+  if $Trainer.party.length<6
+    $Trainer.party[$Trainer.party.length] = pkmn
+  else
+    $PokemonStorage.pbStoreCaught(pkmn)
+    Kernel.pbMessage(_INTL("The egg was transfered to the PC."))
+  end
   return true
 end
 alias pbAddEgg pbGenerateEgg
diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata
index a45219f5e..61cba7ea2 100644
Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ
diff --git a/Data/States.rxdata b/Data/States.rxdata
index 868d49e59..0f9b4ae5d 100644
Binary files a/Data/States.rxdata and b/Data/States.rxdata differ
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 083e0f9fc..0b72436e0 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index 8d113cbfb..2c6933d73 100644
Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ
diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata
index c7ea19a7a..d9bd35260 100644
Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ