diff --git a/Data/Map001.rxdata b/Data/Map001.rxdata
index 880ce3f89..8de12b105 100644
Binary files a/Data/Map001.rxdata and b/Data/Map001.rxdata differ
diff --git a/Data/Map327.rxdata b/Data/Map327.rxdata
index 95c85cb99..16eaf5e1c 100644
Binary files a/Data/Map327.rxdata and b/Data/Map327.rxdata differ
diff --git a/Data/Map360.rxdata b/Data/Map360.rxdata
index 340f3ed27..3636b6618 100644
Binary files a/Data/Map360.rxdata and b/Data/Map360.rxdata differ
diff --git a/Data/Map531.rxdata b/Data/Map531.rxdata
index 450a0cb06..1f7d3de81 100644
Binary files a/Data/Map531.rxdata and b/Data/Map531.rxdata differ
diff --git a/Data/Map601.rxdata b/Data/Map601.rxdata
index 3b180693a..84068503d 100644
Binary files a/Data/Map601.rxdata and b/Data/Map601.rxdata differ
diff --git a/Data/Map606.rxdata b/Data/Map606.rxdata
index 9cd4d2755..9808fac94 100644
Binary files a/Data/Map606.rxdata and b/Data/Map606.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index cb4249e0e..46f8de2c8 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/014_Pokemon/001_Pokemon.rb b/Data/Scripts/014_Pokemon/001_Pokemon.rb
index 38da45b97..e7d44d28e 100644
--- a/Data/Scripts/014_Pokemon/001_Pokemon.rb
+++ b/Data/Scripts/014_Pokemon/001_Pokemon.rb
@@ -146,7 +146,7 @@ class Pokemon
 
   def hasBodyOf?(check_species)
     if !self.isFusion?
-      return isSpecies(check_species)
+      return isSpecies?(check_species)
     end
     bodySpecies = getBodyID(species)
     checkSpeciesId = getID(nil,check_species)
@@ -155,7 +155,7 @@ class Pokemon
 
   def hasHeadOf?(check_species)
     if !self.isFusion?
-      return isSpecies(check_species)
+      return isSpecies?(check_species)
     end
     headSpecies = getHeadID(species)
     checkSpeciesId = getID(nil,check_species)
diff --git a/Data/Scripts/016_UI/006_UI_Summary.rb b/Data/Scripts/016_UI/006_UI_Summary.rb
index ded916875..58bc055af 100644
--- a/Data/Scripts/016_UI/006_UI_Summary.rb
+++ b/Data/Scripts/016_UI/006_UI_Summary.rb
@@ -1344,7 +1344,7 @@ class PokemonSummaryScreen
     loop do
       ret = @scene.pbChooseMoveToForget(move_to_learn)
       break if ret < 0 || !move_to_learn
-      break if $DEBUG || !party[partyindex].moves[ret].hidden_move?
+      # break if $DEBUG || !party[partyindex].moves[ret].hidden_move?
       pbMessage(_INTL("HM moves can't be forgotten now.")) { @scene.pbUpdate }
     end
     @scene.pbEndScene
diff --git a/Data/System.rxdata b/Data/System.rxdata
index cf96f0820..2302153af 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ