diff --git a/Data/Map040.rxdata b/Data/Map040.rxdata
index b541db2ca..bd64e7bb4 100644
Binary files a/Data/Map040.rxdata and b/Data/Map040.rxdata differ
diff --git a/Data/Map724.rxdata b/Data/Map724.rxdata
index d31c2ec6e..b4f284c2c 100644
Binary files a/Data/Map724.rxdata and b/Data/Map724.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 1f1020806..0f327f0e2 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/011_Battle/001_Battler/003_Battler_ChangeSelf.rb b/Data/Scripts/011_Battle/001_Battler/003_Battler_ChangeSelf.rb
index a5c0a3119..dddffc247 100644
--- a/Data/Scripts/011_Battle/001_Battler/003_Battler_ChangeSelf.rb
+++ b/Data/Scripts/011_Battle/001_Battler/003_Battler_ChangeSelf.rb
@@ -274,6 +274,10 @@ class PokeBattle_Battler
   end
 
   def pbTransform(target)
+    if target.is_a?(Integer)
+      @battle.pbDisplay(_INTL("But it failed..."))
+      return
+    end
     oldAbil = @ability_id
     @effects[PBEffects::Transform]        = true
     @effects[PBEffects::TransformSpecies] = target.species
diff --git a/Data/Scripts/011_Battle/002_Move/005_Move_Effects_000-07F.rb b/Data/Scripts/011_Battle/002_Move/005_Move_Effects_000-07F.rb
index 10c2f01ff..99210346d 100644
--- a/Data/Scripts/011_Battle/002_Move/005_Move_Effects_000-07F.rb
+++ b/Data/Scripts/011_Battle/002_Move/005_Move_Effects_000-07F.rb
@@ -2717,34 +2717,34 @@ end
 #################
 #  Fusion Swap
 # ###############
-class PokeBattle_Move_080 < PokeBattle_Move
-  def pbMoveFailed?(user,targets)
-    if targets[0].effects[PBEffects::Transform]
-      @battle.pbDisplay(_INTL("But it failed!"))
-      return true
-    end
-    return false
-  end
-
-  def pbFailsAgainstTarget?(user,target)
-    if target.effects[PBEffects::Transform] ||
-      target.effects[PBEffects::Illusion] ||
-      !target.pokemon.isFusion?
-      @battle.pbDisplay(_INTL("But it failed!"))
-      return true
-    end
-    return false
-  end
-
-  def pbEffectAgainstTarget(user,target)
-    body = getBasePokemonID(target.pokemon.species, true)
-    head = getBasePokemonID(target.pokemon.species, false)
-    newspecies = (head) * Settings::NB_POKEMON + body
-    target.pbTransform(newspecies)
-  end
-
-  def pbShowAnimation(id,user,targets,hitNum=0,showAnimation=true)
-    super
-    @battle.scene.pbChangePokemon(user,targets[0].pokemon)
-  end
-end
+# class PokeBattle_Move_XXX < PokeBattle_Move
+#   def pbMoveFailed?(user,targets)
+#     if targets[0].effects[PBEffects::Transform]
+#       @battle.pbDisplay(_INTL("But it failed!"))
+#       return true
+#     end
+#     return false
+#   end
+#
+#   def pbFailsAgainstTarget?(user,target)
+#     if target.effects[PBEffects::Transform] ||
+#       target.effects[PBEffects::Illusion] ||
+#       !target.pokemon.isFusion?
+#       @battle.pbDisplay(_INTL("But it failed!"))
+#       return true
+#     end
+#     return false
+#   end
+#
+#   def pbEffectAgainstTarget(user,target)
+#     body = getBasePokemonID(target.pokemon.species, true)
+#     head = getBasePokemonID(target.pokemon.species, false)
+#     newspecies = (head) * Settings::NB_POKEMON + body
+#     target.pbTransform(newspecies)
+#   end
+#
+#   def pbShowAnimation(id,user,targets,hitNum=0,showAnimation=true)
+#     super
+#     @battle.scene.pbChangePokemon(user,targets[0].pokemon)
+#   end
+# end
diff --git a/Data/System.rxdata b/Data/System.rxdata
index da0dce05e..a63bb0f16 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ