diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index fe6f4d849..63c207abb 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Map035.rxdata b/Data/Map035.rxdata
index c882496c7..9c0d64729 100644
Binary files a/Data/Map035.rxdata and b/Data/Map035.rxdata differ
diff --git a/Data/Map047.rxdata b/Data/Map047.rxdata
index 813c4451b..60f767389 100644
Binary files a/Data/Map047.rxdata and b/Data/Map047.rxdata differ
diff --git a/Data/Map095.rxdata b/Data/Map095.rxdata
index 5aec2a2ce..9ad58a7a4 100644
Binary files a/Data/Map095.rxdata and b/Data/Map095.rxdata differ
diff --git a/Data/Map300.rxdata b/Data/Map300.rxdata
index 18eb56e6b..1839c9244 100644
Binary files a/Data/Map300.rxdata and b/Data/Map300.rxdata differ
diff --git a/Data/Map335.rxdata b/Data/Map335.rxdata
index c6f43a667..afefb0860 100644
Binary files a/Data/Map335.rxdata and b/Data/Map335.rxdata differ
diff --git a/Data/Map415.rxdata b/Data/Map415.rxdata
index 7c6421266..6ef5cc80a 100644
Binary files a/Data/Map415.rxdata and b/Data/Map415.rxdata differ
diff --git a/Data/Map561.rxdata b/Data/Map561.rxdata
index 105bdb304..a62d958f7 100644
Binary files a/Data/Map561.rxdata and b/Data/Map561.rxdata differ
diff --git a/Data/Map563.rxdata b/Data/Map563.rxdata
index 43c10733f..0bf662fbc 100644
Binary files a/Data/Map563.rxdata and b/Data/Map563.rxdata differ
diff --git a/Data/Map565.rxdata b/Data/Map565.rxdata
index 0878e58c3..d05428d72 100644
Binary files a/Data/Map565.rxdata and b/Data/Map565.rxdata differ
diff --git a/Data/Map638.rxdata b/Data/Map638.rxdata
index 711d5ebb7..fd2efa34c 100644
Binary files a/Data/Map638.rxdata and b/Data/Map638.rxdata differ
diff --git a/Data/Map771.rxdata b/Data/Map771.rxdata
index 6c8cf40b0..95da7fcd2 100644
Binary files a/Data/Map771.rxdata and b/Data/Map771.rxdata differ
diff --git a/Data/Map772.rxdata b/Data/Map772.rxdata
index 0e7b50701..bf84461ca 100644
Binary files a/Data/Map772.rxdata and b/Data/Map772.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index d309086f6..30d12ee0e 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/013_Items/004_1_PokeradarUI.rb b/Data/Scripts/013_Items/004_1_PokeradarUI.rb
index 74aa8cba4..5843dcdcb 100644
--- a/Data/Scripts/013_Items/004_1_PokeradarUI.rb
+++ b/Data/Scripts/013_Items/004_1_PokeradarUI.rb
@@ -92,7 +92,7 @@ class PokeRadar_UI
     @sprites[iconId].z = 100
 
     @current_x += ICON_MARGIN_X
-    if @current_x > ICON_LINE_END
+    if @current_x >= ICON_LINE_END
       @current_x = ICON_START_X
       @current_y +=ICON_MARGIN_Y
       @sprites["background"].zoom_y += 1
diff --git a/Data/Scripts/016_UI/017_UI_PokemonStorage.rb b/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
index 9368f3d14..c26be3d82 100644
--- a/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
+++ b/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
@@ -2156,7 +2156,8 @@ class PokemonStorageScreen
           pbDisplay(_INTL("{1} is already fused!", heldpoke.name))
           return
         end
-        if(selected.egg? || heldpoke.egg?)
+        p selected
+        if(heldpoke.egg?)
           pbDisplay(_INTL("It's impossible to fuse an egg!"))
           return
         end
diff --git a/Data/Scripts/050_AddOns/GeneralUtils.rb b/Data/Scripts/050_AddOns/GeneralUtils.rb
index 5a6921e1e..28f1494a8 100644
--- a/Data/Scripts/050_AddOns/GeneralUtils.rb
+++ b/Data/Scripts/050_AddOns/GeneralUtils.rb
@@ -202,6 +202,9 @@ end
 
 def getBodyID(species)
   dexNum = getDexNumberForSpecies(species)
+  if dexNum % NB_POKEMON ==0
+    return (dexNum/NB_POKEMON)-1
+  end
   return (dexNum / NB_POKEMON).round
 end
 
@@ -209,9 +212,10 @@ def getHeadID(species, bodyId = nil)
   if bodyId == nil
     bodyId = getBodyID(species)
   end
-  head_dexNum = getDexNumberForSpecies(species)
+  fused_dexNum = getDexNumberForSpecies(species)
   body_dexNum = getDexNumberForSpecies(bodyId)
-  calculated_number = (head_dexNum - (body_dexNum * NB_POKEMON)).round
+
+  calculated_number = (fused_dexNum - (body_dexNum * NB_POKEMON)).round
   return calculated_number == 0 ? 420 : calculated_number
 end
 
diff --git a/Data/Scripts/050_AddOns/New Items effects.rb b/Data/Scripts/050_AddOns/New Items effects.rb
index 444bd18dd..65fcc5dde 100644
--- a/Data/Scripts/050_AddOns/New Items effects.rb	
+++ b/Data/Scripts/050_AddOns/New Items effects.rb	
@@ -1483,7 +1483,7 @@ def pbUnfuse(pokemon, scene, supersplicers, pcPosition = nil)
         end
       end
       pokemon.debug_shiny=true if pokemon.debug_shiny && pokemon.body_shiny
-      poke2.debug_shiny=true if pokemon.debug_shiny || poke2.head_shiny
+      poke2.debug_shiny=true if pokemon.debug_shiny && poke2.head_shiny
 
       pokemon.body_shiny=false
       pokemon.head_shiny=false
diff --git a/Data/Scripts/050_AddOns/QuestLogScript.rb b/Data/Scripts/050_AddOns/QuestLogScript.rb
index 3acfce135..4d51e3620 100644
--- a/Data/Scripts/050_AddOns/QuestLogScript.rb
+++ b/Data/Scripts/050_AddOns/QuestLogScript.rb
@@ -145,7 +145,8 @@ QUESTS = [
  Quest.new(42, "Stolen artifact", "Recover a stolen vase from a burglar in the Pokémon Mansion", questBranchHotels, "BW (21)","Cinnabar Island", defaultQuestColor),
  Quest.new(43, "Fallen Meteor", "Investigate a crater near Bond Bridge.", questBranchHotels, "BW009","Kin Island", defaultQuestColor), 
  Quest.new(44, "First Contact", "Find the missing pieces of a fallen alien spaceship", questBranchHotels, "BW (92)","Bond Bridge", questBranchField), 
- Quest.new(45, "First Contact (Part 2)", "Ask the sailor at Cinnabar Island's harbour to take you to the uncharted island where the spaceship might be located", questBranchHotels, "BW (92)","Bond Bridge", questBranchField), 
+ Quest.new(45, "First Contact (Part 2)", "Ask the sailor at Cinnabar Island's harbour to take you to the uncharted island where the spaceship might be located", questBranchHotels, "BW (92)","Bond Bridge", defaultQuestColor),
+ Quest.new(46, "The rarest fish", "A fisherman wants you to show him a Feebas. Apparently they can be fished around the Sevii Islands when it rains.", questBranchField, "BW056","Kin Island", defaultQuestColor),
 
  # attention: c'est un array et non un hash... l'id est en fait l'index, donc il est important de garder l'ordre
   #out of order quests
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 3da320866..177b82dea 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index 421bb6372..82d2862a8 100644
Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ