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 065a7e253..d940ad63a 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 b8d159f71..15f906746 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/Map011.rxdata b/Data/Map011.rxdata
index 6c30020dc..35c70abbb 100644
Binary files a/Data/Map011.rxdata and b/Data/Map011.rxdata differ
diff --git a/Data/Map019.rxdata b/Data/Map019.rxdata
index 53c95f403..75c2597e7 100644
Binary files a/Data/Map019.rxdata and b/Data/Map019.rxdata differ
diff --git a/Data/Map025.rxdata b/Data/Map025.rxdata
index 60c1241b1..33b8c3e2f 100644
Binary files a/Data/Map025.rxdata and b/Data/Map025.rxdata differ
diff --git a/Data/Map154.rxdata b/Data/Map154.rxdata
index 0c00b2a0e..838bd1c18 100644
Binary files a/Data/Map154.rxdata and b/Data/Map154.rxdata differ
diff --git a/Data/Map337.rxdata b/Data/Map337.rxdata
index 4d53a85db..72d0c304e 100644
Binary files a/Data/Map337.rxdata and b/Data/Map337.rxdata differ
diff --git a/Data/Map338.rxdata b/Data/Map338.rxdata
index 88a31ee17..17064e056 100644
Binary files a/Data/Map338.rxdata and b/Data/Map338.rxdata differ
diff --git a/Data/Map395.rxdata b/Data/Map395.rxdata
index 97c6eb822..a509a5b0a 100644
Binary files a/Data/Map395.rxdata and b/Data/Map395.rxdata differ
diff --git a/Data/Map431.rxdata b/Data/Map431.rxdata
index 8bc91b4fb..8fa7e9125 100644
Binary files a/Data/Map431.rxdata and b/Data/Map431.rxdata differ
diff --git a/Data/Map434.rxdata b/Data/Map434.rxdata
index 3781f277c..f25c29049 100644
Binary files a/Data/Map434.rxdata and b/Data/Map434.rxdata differ
diff --git a/Data/Map446.rxdata b/Data/Map446.rxdata
index a22ab1a5f..a64ff6416 100644
Binary files a/Data/Map446.rxdata and b/Data/Map446.rxdata differ
diff --git a/Data/Map609.rxdata b/Data/Map609.rxdata
index 33365760e..ae257aca9 100644
Binary files a/Data/Map609.rxdata and b/Data/Map609.rxdata differ
diff --git a/Data/Map732.rxdata b/Data/Map732.rxdata
index 50484d788..6faf0446b 100644
Binary files a/Data/Map732.rxdata and b/Data/Map732.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 0555f9366..97e2bd1c5 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
index 8846cbf3b..0da910260 100644
--- a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
+++ b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
@@ -191,9 +191,11 @@ end
 def pbCut
   move = :CUT
   movefinder = $Trainer.get_pokemon_with_move(move)
-  if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_CUT, false) || (!$DEBUG && !movefinder) || $PokemonBag.pbQuantity(:MACHETE)>0
-    pbMessage(_INTL("This tree looks like it can be cut down."))
-    return false
+  if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_CUT, false) || (!$DEBUG && !movefinder)
+    if $PokemonBag.pbQuantity(:MACHETE)<=0
+      pbMessage(_INTL("This tree looks like it can be cut down."))
+      return false
+    end
   end
   pbMessage(_INTL("This tree looks like it can be cut down!\1"))
   if pbConfirmMessage(_INTL("Would you like to cut it?"))
@@ -302,9 +304,11 @@ def pbDive
   return false if !map_metadata || !map_metadata.dive_map_id
   move = :DIVE
   movefinder = $Trainer.get_pokemon_with_move(move)
-  if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_DIVE, false) || (!$DEBUG && !movefinder) || $PokemonBag.pbQuantity(:SCUBAGEAR)>0
-    pbMessage(_INTL("The sea is deep here. A Pokémon may be able to go underwater."))
-    return false
+  if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_DIVE, false) || (!$DEBUG && !movefinder)
+    if $PokemonBag.pbQuantity(:SCUBAGEAR)>0
+      pbMessage(_INTL("The sea is deep here. A Pokémon may be able to go underwater."))
+      return false
+    end
   end
   if pbConfirmMessage(_INTL("The sea is deep here. Would you like to use Dive?"))
     speciesname = (movefinder) ? movefinder.name : $Trainer.name
@@ -614,9 +618,11 @@ end
 def pbRockSmash
   move = :ROCKSMASH
   movefinder = $Trainer.get_pokemon_with_move(move)
-  if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_ROCKSMASH, false) || (!$DEBUG && !movefinder) || $PokemonBag.pbQuantity(:PICKAXE)>0
-    pbMessage(_INTL("It's a rugged rock, but a Pokémon may be able to smash it."))
-    return false
+  if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_ROCKSMASH, false) || (!$DEBUG && !movefinder)
+    if $PokemonBag.pbQuantity(:PICKAXE)<=0
+      pbMessage(_INTL("It's a rugged rock, but a Pokémon may be able to smash it."))
+      return false
+    end
   end
   if pbConfirmMessage(_INTL("This rock appears to be breakable. Would you like to use Rock Smash?"))
     speciesname = (movefinder) ? movefinder.name : $Trainer.name
@@ -661,9 +667,11 @@ def pbStrength
   end
   move = :STRENGTH
   movefinder = $Trainer.get_pokemon_with_move(move)
-  if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_STRENGTH, false) || (!$DEBUG && !movefinder) || $PokemonBag.pbQuantity(:LEVER)>0
-    pbMessage(_INTL("It's a big boulder, but a Pokémon may be able to push it aside."))
-    return false
+  if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_STRENGTH, false) || (!$DEBUG && !movefinder)
+    if  $PokemonBag.pbQuantity(:LEVER)<=0
+      pbMessage(_INTL("It's a big boulder, but a Pokémon may be able to push it aside."))
+      return false
+    end
   end
   pbMessage(_INTL("It's a big boulder, but a Pokémon may be able to push it aside.\1"))
   if pbConfirmMessage(_INTL("Would you like to use Strength?"))
@@ -706,10 +714,13 @@ HiddenMoveHandlers::UseMove.add(:STRENGTH, proc { |move, pokemon|
 def pbSurf
   return false if $game_player.pbFacingEvent
   return false if $game_player.pbHasDependentEvents?
+  return false if $PokemonGlobal.diving || $PokemonGlobal.surfing
   move = :SURF
   movefinder = $Trainer.get_pokemon_with_move(move)
-  if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_SURF, false) || (!$DEBUG && !movefinder) || $PokemonBag.pbQuantity(:SURFBOARD)>0
-    return false
+  if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_SURF, false) || (!$DEBUG && !movefinder)
+    if $PokemonBag.pbQuantity(:SURFBOARD)<=0
+      return false
+    end
   end
   if pbConfirmMessage(_INTL("The water is a deep blue...\nWould you like to surf on it?"))
     speciesname = (movefinder) ? movefinder.name : $Trainer.name
@@ -948,9 +959,11 @@ end
 def pbWaterfall
   move = :WATERFALL
   movefinder = $Trainer.get_pokemon_with_move(move)
-  if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_WATERFALL, false) || (!$DEBUG && !movefinder) || $PokemonBag.pbQuantity(:JETPACK)>0
-    pbMessage(_INTL("A wall of water is crashing down with a mighty roar."))
-    return false
+  if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_WATERFALL, false) || (!$DEBUG && !movefinder)
+    if $PokemonBag.pbQuantity(:JETPACK)<=0
+      pbMessage(_INTL("A wall of water is crashing down with a mighty roar."))
+      return false
+    end
   end
   if pbConfirmMessage(_INTL("It's a large waterfall. Would you like to use Waterfall?"))
     speciesname = (movefinder) ? movefinder.name : $Trainer.name
diff --git a/Data/Scripts/050_AddOns/New Items effects.rb b/Data/Scripts/050_AddOns/New Items effects.rb
index 3a4b0d705..c8731e383 100644
--- a/Data/Scripts/050_AddOns/New Items effects.rb	
+++ b/Data/Scripts/050_AddOns/New Items effects.rb	
@@ -1390,8 +1390,8 @@ def pbDNASplicing(pokemon, scene, supersplicers = false, superSplicer = false)
         end
 
         #On ajoute l'autre dans le pokedex aussi
-        $Trainer.pokedex.set_seen(poke1.species)
-        $Trainer.pokedex.set_owned(poke1.species)
+        # $Trainer.pokedex.set_seen(poke1.species)
+        # $Trainer.pokedex.set_owned(poke1.species)
 
         pokemon.species = poke1.species
         pokemon.level = poke1.level
diff --git a/Data/Scripts/050_AddOns/PokemonFusion.rb b/Data/Scripts/050_AddOns/PokemonFusion.rb
index af226ed18..3c3e7edbe 100644
--- a/Data/Scripts/050_AddOns/PokemonFusion.rb
+++ b/Data/Scripts/050_AddOns/PokemonFusion.rb
@@ -562,6 +562,15 @@ class PokemonFusionScene
     @sprites["rsprite2"] = rsprite2
     @sprites["rsprite3"] = rsprite3
 
+    @sprites["rsprite1"].zoom_x = Settings::FRONTSPRITE_SCALE
+    @sprites["rsprite1"].zoom_y = Settings::FRONTSPRITE_SCALE
+
+    @sprites["rsprite2"].zoom_x = Settings::FRONTSPRITE_SCALE
+    @sprites["rsprite2"].zoom_y = Settings::FRONTSPRITE_SCALE
+
+    @sprites["rsprite3"].zoom_x = Settings::FRONTSPRITE_SCALE
+    @sprites["rsprite3"].zoom_y = Settings::FRONTSPRITE_SCALE
+
     pbGenerateMetafiles(rsprite1.ox, rsprite1.oy, rsprite2.ox, rsprite2.oy, rsprite3.ox, rsprite3.oy, rsprite1.x, rsprite3.x)
 
     @sprites["msgwindow"] = Kernel.pbCreateMessageWindow(@viewport)
@@ -718,6 +727,8 @@ class PokemonFusionScene
 
       #make it untraded, pour qu'on puisse le unfused après, même si un des 2 était traded
       @pokemon1.obtain_method = 0
+      @pokemon1.owner = Pokemon::Owner.new_from_trainer($Trainer)
+
 
       @pokemon1.ability = pbChooseAbility(@pokemon1, hiddenAbility1, hiddenAbility2)
       if superSplicer
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 e467d2ad0..e119348ec 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index aab88dc2e..6d375ff7e 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