diff --git a/Data/Map017.rxdata b/Data/Map017.rxdata
index 45f3d5e12..f801f4bfc 100644
Binary files a/Data/Map017.rxdata and b/Data/Map017.rxdata differ
diff --git a/Data/Map240.rxdata b/Data/Map240.rxdata
index b5bba9137..e64d3d6ba 100644
Binary files a/Data/Map240.rxdata and b/Data/Map240.rxdata differ
diff --git a/Data/Scripts/050_Outfits/OutfitIds.rb b/Data/Scripts/050_Outfits/OutfitIds.rb
index 3ffa33053..165dbc81e 100644
--- a/Data/Scripts/050_Outfits/OutfitIds.rb
+++ b/Data/Scripts/050_Outfits/OutfitIds.rb
@@ -85,6 +85,10 @@ HAT_FLOWER = "mikufairy"
 HAT_SKITTY_TV = "skittyTV"
 HAT_TVHEAD = "tvhead"
 
+HAT_SCRIBBLES1 = "scribbles1"
+HAT_SCRIBBLES2 = "scribbles2"
+HAT_SCRIBBLES3 = "scribbles3"
+HAT_SCRIBBLES4 = "scribbles4"
 
 HAT_CARDBOARD_BOX = "box"
 HAT_CAPTAIN = "seacaptain"
diff --git a/Data/Scripts/052_AddOns/GameplayUtils.rb b/Data/Scripts/052_AddOns/GameplayUtils.rb
index 0c997de10..946d20682 100644
--- a/Data/Scripts/052_AddOns/GameplayUtils.rb
+++ b/Data/Scripts/052_AddOns/GameplayUtils.rb
@@ -1777,4 +1777,24 @@ def purchaseDyeKitMenu(hats_kit_price=0,clothes_kit_price=0)
   end
   pbCallBub(2,@event_id)
   pbMessage("You can use \\C[1]Dye Kits\\C[0] at any time when you change clothes.")
+end
+
+def giveJigglypuffScribbles(possible_versions = [1,2,3,4])
+  selected_scribbles_version = possible_versions.sample
+  case selected_scribbles_version
+  when 1
+    scribbles_id= HAT_SCRIBBLES1
+  when 2
+    scribbles_id= HAT_SCRIBBLES2
+  when 3
+    scribbles_id= HAT_SCRIBBLES3
+  when 4
+    scribbles_id= HAT_SCRIBBLES4
+  end
+  return if !scribbles_id
+
+  if !hasHat?(scribbles_id)
+    $Trainer.unlocked_hats << scribbles_id
+  end
+  putOnHat(scribbles_id,true,true)
 end
\ No newline at end of file
diff --git a/Data/System.rxdata b/Data/System.rxdata
index fa3841a71..3c11fc4a7 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/outfits/hats_data.json b/Data/outfits/hats_data.json
index 679024a39..6bb0351af 100644
--- a/Data/outfits/hats_data.json
+++ b/Data/outfits/hats_data.json
@@ -318,6 +318,11 @@
         "tags": "nest,",
         "howToGet": "stay idle in celadon"
     },
+    {
+        "id": "eeveeears",
+        "name": "Eevee Ears",
+        "tags": "hairband,pokemon-eevee,"
+    },
     {
         "id": "electrivireheadset",
         "name": "Electivire Headset",
@@ -1107,6 +1112,30 @@
         "price": 25000,
         "tags": "hat,pokemon-delibird,"
     },
+    {
+        "id": "scribbles1",
+        "name": "Mask Scribbles",
+        "description": "Markings in the shape of a mask drawn on your face by a mischievous Jigglypuff!",
+        "tags": "special,mask,"
+    },
+    {
+        "id": "scribbles2",
+        "name": "Moustache Scribbles",
+        "description": "Markings in the shape of a moustache drawn on your face by a mischievous Jigglypuff!",
+        "tags": "special,mask,"
+    },
+    {
+        "id": "scribbles3",
+        "name": "Circle Scribbles",
+        "description": "Markings in the shape of a circle drawn on your face by a mischievous Jigglypuff!",
+        "tags": "special,mask,"
+    },
+    {
+        "id": "scribbles4",
+        "name": "Swirly Scribbles",
+        "description": "Markings in the shape of a swirl drawn on your face by a mischievous Jigglypuff!",
+        "tags": "special,mask,"
+    },
     {
         "id": "seacaptain",
         "name": "Captain's Hat",
diff --git a/Graphics/Tilesets/Indoor.PNG b/Graphics/Tilesets/Indoor.PNG
index 762cc5719..70f8ef373 100644
Binary files a/Graphics/Tilesets/Indoor.PNG and b/Graphics/Tilesets/Indoor.PNG differ