diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 6d64cc46c..5a7859345 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/020_Debug/001_Editor_Utilities.rb b/Data/Scripts/020_Debug/001_Editor_Utilities.rb
index e25512fce..5260c2aaa 100644
--- a/Data/Scripts/020_Debug/001_Editor_Utilities.rb
+++ b/Data/Scripts/020_Debug/001_Editor_Utilities.rb
@@ -115,14 +115,16 @@ end
 # selected (or nil if the selection was canceled). "default", if specified, is
 # the ID of the species to initially select. Pressing Input::ACTION will toggle
 # the list sorting between numerical and alphabetical.
-def pbChooseSpeciesList(default = nil)
+def pbChooseSpeciesList(default = nil,max=nil)
   # commands = []
   # GameData::Species.each { |s| commands.push([s.id_number, s.real_name, s.id]) if s.form == 0 }
   # return pbChooseList(commands, default, nil, -1)
   #
   defaultNumber = default == nil ? 1 : getDexNumberForSpecies(default)
   params = ChooseNumberParams.new
-  params.setRange(1,PBSpecies.maxValue)
+
+  max = max ? max : PBSpecies.maxValue
+  params.setRange(1,max)
   params.setInitialValue(defaultNumber)
   dexNum = pbMessageChooseNumber("dex number?",params)
   return GameData::Species.get(dexNum)
diff --git a/Data/Scripts/020_Debug/003_Debug menus/005_Debug_PokemonCommands.rb b/Data/Scripts/020_Debug/003_Debug menus/005_Debug_PokemonCommands.rb
index 66c7bb5f9..53a6de831 100644
--- a/Data/Scripts/020_Debug/003_Debug menus/005_Debug_PokemonCommands.rb	
+++ b/Data/Scripts/020_Debug/003_Debug menus/005_Debug_PokemonCommands.rb	
@@ -858,8 +858,7 @@ PokemonDebugMenuCommands.register("speciesform", {
              _INTL("Species {1}, form {2} (forced).", pkmn.speciesName, pkmn.form)][(pkmn.forced_form.nil?) ? 0 : 1]
       cmd = screen.pbShowCommands(msg, [
          _INTL("Set species"),
-         _INTL("Set form"),
-         _INTL("Remove form override")], cmd)
+         _INTL("Set fusion species")], cmd)
       break if cmd < 0
       case cmd
       when 0   # Set species
@@ -874,6 +873,26 @@ PokemonDebugMenuCommands.register("speciesform", {
           screen.pbRefreshSingle(pkmnid)
         end
       when 1   # Set form
+        old_head_dex = get_head_number_from_symbol(pkmn.species)
+        old_body_dex = get_body_number_from_symbol(pkmn.species)
+        pbMessage('Head species?')
+        head_species = pbChooseSpeciesList(old_head_dex,NB_POKEMON)
+        pbMessage('Body species?')
+        body_species = pbChooseSpeciesList(old_body_dex,NB_POKEMON)
+
+        fused_species_dex = getFusionSpecies(head_species.species, body_species.species)
+        species = GameData::Species.get(fused_species_dex)
+
+        if species && species != pkmn.species
+          pkmn.species = species
+          if pkmn.shiny?
+            pkmn.debug_shiny=true
+          end
+          pkmn.calc_stats
+          $Trainer.pokedex.register(pkmn) if !settingUpBattle
+          screen.pbRefreshSingle(pkmnid)
+        end
+
         # cmd2 = 0
         # formcmds = [[], []]
         # GameData::Species.each do |sp|
@@ -901,9 +920,9 @@ PokemonDebugMenuCommands.register("speciesform", {
         #     screen.pbRefreshSingle(pkmnid)
         #   end
         # end
-      when 2   # Remove form override
-        pkmn.forced_form = nil
-        screen.pbRefreshSingle(pkmnid)
+      # when 2   # Remove form override
+      #   pkmn.forced_form = nil
+      #   screen.pbRefreshSingle(pkmnid)
       end
     end
     next false
diff --git a/Data/System.rxdata b/Data/System.rxdata
index cb8bda357..d8cb2464a 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ