diff --git a/Data/Map001.rxdata b/Data/Map001.rxdata
index 05c16391f..6d4258b9b 100644
Binary files a/Data/Map001.rxdata and b/Data/Map001.rxdata differ
diff --git a/Data/Scripts/050_Outfits/UI/clothesShop/0_OutfitsMartAdapter.rb b/Data/Scripts/050_Outfits/UI/clothesShop/0_OutfitsMartAdapter.rb
index ecb1047e0..8ae856d56 100644
--- a/Data/Scripts/050_Outfits/UI/clothesShop/0_OutfitsMartAdapter.rb
+++ b/Data/Scripts/050_Outfits/UI/clothesShop/0_OutfitsMartAdapter.rb
@@ -148,4 +148,12 @@ class OutfitsMartAdapter < PokemonMartAdapter
   def showQuantity?(item)
     super
   end
+
+  def updateVersion(item)
+    @version = 1 if !currentVersionExists?(item)
+  end
+
+  def currentVersionExists?(item)
+    return true
+  end
 end
diff --git a/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopView.rb b/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopView.rb
index 0e9323101..c0fd5a22b 100644
--- a/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopView.rb
+++ b/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopView.rb
@@ -94,6 +94,7 @@ class ClothesShopView < PokemonMart_Scene
         description = @adapter.getSpecialItemDescription(itemwindow.item)
       else
         description = @adapter.getDescription(itemwindow.item)
+        @adapter.updateVersion(itemwindow.item)
       end
       @adapter.updateTrainerPreview(itemwindow.item, @sprites["trainerPreview"])
     else
diff --git a/Data/Scripts/050_Outfits/UI/clothesShop/HairMartAdapter.rb b/Data/Scripts/050_Outfits/UI/clothesShop/HairMartAdapter.rb
index b97d5e76e..70ae193fa 100644
--- a/Data/Scripts/050_Outfits/UI/clothesShop/HairMartAdapter.rb
+++ b/Data/Scripts/050_Outfits/UI/clothesShop/HairMartAdapter.rb
@@ -107,7 +107,6 @@ class HairMartAdapter < OutfitsMartAdapter
 
   def getItemIcon(item)
     return Settings::BACK_ITEM_ICON_PATH if !item
-    itemId = getCurrentHairId(item.id)
     return getOverworldHatFilename(item.id)
   end
 
@@ -115,6 +114,7 @@ class HairMartAdapter < OutfitsMartAdapter
     item = @previous_item if !item
     item = @previous_item if item.is_a?(Symbol)
     @previous_item = find_first_item() if !item.is_a?(Symbol)
+
     displayed_hat = @hat_visible ? @worn_hat : nil
     displayed_hat2 = @hat_visible ? @worn_hat2 : nil
 
@@ -200,4 +200,10 @@ class HairMartAdapter < OutfitsMartAdapter
     switchVersion(nil,1)
   end
 
+  def currentVersionExists?(item)
+    hairId = getCurrentHairId(item.id)
+    filename = getOverworldHairFilename(hairId)
+    return pbResolveBitmap(filename)
+  end
+
 end
diff --git a/Data/Scripts/052_AddOns/GameplayUtils.rb b/Data/Scripts/052_AddOns/GameplayUtils.rb
index 29c51f5e0..91b05f38b 100644
--- a/Data/Scripts/052_AddOns/GameplayUtils.rb
+++ b/Data/Scripts/052_AddOns/GameplayUtils.rb
@@ -1299,7 +1299,7 @@ end
 def exit_pokemart()
   pokemart_entrances = {
     :PEWTER => [380, 43, 24],
-    :CERULEAN => [1, 19, 22],
+    :CERULEAN => [1, 24, 22],
     :VERMILLION => [19, 32, 13],
     :LAVENDER => [50, 20, 23],
     :CELADON => [95, 18, 15], # not a real pokemart
diff --git a/Data/System.rxdata b/Data/System.rxdata
index fd3487c56..05a02645f 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/messages.dat b/Data/messages.dat
index 8a862e0b8..4fcae61c8 100644
Binary files a/Data/messages.dat and b/Data/messages.dat differ
diff --git a/Data/town_map.dat b/Data/town_map.dat
index 7399af139..f8faa1469 100644
Binary files a/Data/town_map.dat and b/Data/town_map.dat differ