diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata
index 7967a5432..41edc8e26 100644
Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ
diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata
index ece08c031..a311b9b5e 100644
Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ
diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata
index 2249bec14..901f2bb2b 100644
Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ
diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index 6b8163164..74144c7c3 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata
index 004ee903d..be622f513 100644
Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ
diff --git a/Data/Items.rxdata b/Data/Items.rxdata
index 3e62ba6d2..fe767fa0b 100644
Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ
diff --git a/Data/Map077.rxdata b/Data/Map077.rxdata
index d2ad7cc5b..78d8c92e0 100644
Binary files a/Data/Map077.rxdata and b/Data/Map077.rxdata differ
diff --git a/Data/Map811.rxdata b/Data/Map811.rxdata
index cfd71d674..c6e29fff5 100644
Binary files a/Data/Map811.rxdata and b/Data/Map811.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 75e4bfcf5..3e974a4cc 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb
index b2ac6109c..71ba7878c 100644
--- a/Data/Scripts/001_Settings.rb
+++ b/Data/Scripts/001_Settings.rb
@@ -5,8 +5,8 @@
 #==============================================================================#
 module Settings
   # The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
-  GAME_VERSION = '6.2.0'
-  GAME_VERSION_NUMBER = "6.2.0"
+  GAME_VERSION = '6.2.1'
+  GAME_VERSION_NUMBER = "6.2.1"
 
   POKERADAR_LIGHT_ANIMATION_RED_ID = 17
   POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18
diff --git a/Data/Scripts/013_Items/004_1_PokeradarUI.rb b/Data/Scripts/013_Items/004_1_PokeradarUI.rb
index 7cb5afaed..9f947d373 100644
--- a/Data/Scripts/013_Items/004_1_PokeradarUI.rb
+++ b/Data/Scripts/013_Items/004_1_PokeradarUI.rb
@@ -10,7 +10,7 @@ class PokeRadar_UI
 
   ICON_LINE_END = 450
 
-  GRAPHICS_Z = 99999
+  GRAPHICS_Z = 99998
 
   def initialize(seenPokemon = [], unseenPokemon = [], rarePokemon = [])
     @seen_pokemon = seenPokemon
diff --git a/Data/Scripts/051_AddOns/HiddenAbilityMaps.rb b/Data/Scripts/051_AddOns/HiddenAbilityMaps.rb
index 13d3afd35..fd1ce4d28 100644
--- a/Data/Scripts/051_AddOns/HiddenAbilityMaps.rb
+++ b/Data/Scripts/051_AddOns/HiddenAbilityMaps.rb
@@ -27,7 +27,7 @@ Events.onWildPokemonCreate+=proc {|sender,e|
   if player_on_hidden_ability_map || isAlwaysHiddenAbilityMap($game_map.map_id)
     pokemon=e[0]
     chosenAbility = pokemon.getAbilityList.sample #format: [[:ABILITY, index],...]
-    #pokemon.ability = chosenAbility[0]
+    pokemon.ability = chosenAbility[0]
     pokemon.ability_index = chosenAbility[1]
   end
 }
diff --git a/Data/Scripts/051_AddOns/MultiSaves.rb b/Data/Scripts/051_AddOns/MultiSaves.rb
index df3b69157..d921d8139 100644
--- a/Data/Scripts/051_AddOns/MultiSaves.rb
+++ b/Data/Scripts/051_AddOns/MultiSaves.rb
@@ -64,7 +64,7 @@ def migrateOldSavesToCharacterCustomization()
     $Trainer.unlocked_hairstyles = [Settings::DEFAULT_OUTFIT_MALE, Settings::DEFAULT_OUTFIT_FEMALE]
   end
 
-  if !$Trainer.clothes || !$Trainer.hair || !$Trainer.hat
+  if !$Trainer.clothes || !$Trainer.hair #|| !$Trainer.hat
     setupStartingOutfit()
   end
 end
diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata
index 61cba7ea2..a45219f5e 100644
Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ
diff --git a/Data/States.rxdata b/Data/States.rxdata
index 0f9b4ae5d..868d49e59 100644
Binary files a/Data/States.rxdata and b/Data/States.rxdata differ
diff --git a/Data/System.rxdata b/Data/System.rxdata
index eea5db822..deb50423a 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index ce46c9ae3..4079ff9d6 100644
Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ
diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata
index d9bd35260..c7ea19a7a 100644
Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ
diff --git a/Data/messages.dat b/Data/messages.dat
index f207f5670..a7de94e31 100644
Binary files a/Data/messages.dat and b/Data/messages.dat differ