diff --git a/Data/.DS_Store b/Data/.DS_Store
index 8fc9467a4..2361b7bb5 100644
Binary files a/Data/.DS_Store and b/Data/.DS_Store differ
diff --git a/Data/Map314.rxdata b/Data/Map314.rxdata
index a55877a3a..09ff9d635 100644
Binary files a/Data/Map314.rxdata and b/Data/Map314.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index aa30f0ac3..832f109f3 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts b/Data/Scripts
index 5151d033a..885a1f9d9 160000
--- a/Data/Scripts
+++ b/Data/Scripts
@@ -1 +1 @@
-Subproject commit 5151d033a8bb571956abd6256dd3d586e93e7a51
+Subproject commit 885a1f9d9ec0b0c0572af4ea6833cfcae88b79ff
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 48c0747c9..96d8629d9 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/outfits/hairstyles_data.json b/Data/outfits/hairstyles_data.json
index 01e367942..aac58be44 100644
--- a/Data/outfits/hairstyles_data.json
+++ b/Data/outfits/hairstyles_data.json
@@ -630,6 +630,12 @@
         "price": 500,
         "tags": "short, untied, smooth,cinnabar,"
     },
+    {
+        "id": "shortbeard",
+        "name": "Short Beard",
+        "description": "Either you miraculously got the ability to grow beard as a child, or you got creative with glue and salon floor clippings.",
+        "price": 500
+    },
     {
         "id": "shortcut",
         "name": "Square-Cut Bangs",
diff --git a/Data/outfits/hats_data.json b/Data/outfits/hats_data.json
index b202ccf8a..2afa4e358 100644
--- a/Data/outfits/hats_data.json
+++ b/Data/outfits/hats_data.json
@@ -69,6 +69,13 @@
         "tags": "glasses,trainer,unova,",
         "howToGet": "regional set"
     },
+    {
+        "id": "BirthdayCake",
+        "name": "Birthday Cake",
+        "description": "A tasty birthday cake full of frosting! Wear it on your head a statement.",
+        "price": 4000,
+        "tags": "hat,"
+    },
     {
         "id": "blaineGlasses",
         "name": "Fake Mustache",
@@ -455,6 +462,13 @@
         "price": 12000,
         "tags": "hat,weather-cold,"
     },
+    {
+        "id": "FlareonHat",
+        "name": "Flareon Hood",
+        "description": "An oversized hood featuring large fluffy fur and long ears, resembling a Flareon.",
+        "price": 8000,
+        "tags": "hat,weather-cold,pokemon-flareon,"
+    },
     {
         "id": "froghat",
         "name": "Frog Hat",
diff --git a/Graphics/Characters/player/clothes/gothhoodie/CHANGES NEEDED.docx b/Graphics/Characters/player/clothes/gothhoodie/CHANGES NEEDED.docx
index abb11206a..69bc9c955 100644
Binary files a/Graphics/Characters/player/clothes/gothhoodie/CHANGES NEEDED.docx and b/Graphics/Characters/player/clothes/gothhoodie/CHANGES NEEDED.docx differ
diff --git a/Graphics/Characters/player/clothes/roseradeM/clothes_bike_roseradeM.png b/Graphics/Characters/player/clothes/roseradeM/clothes_bike_roseradeM.png
index 8eb102834..f64aef3cc 100644
Binary files a/Graphics/Characters/player/clothes/roseradeM/clothes_bike_roseradeM.png and b/Graphics/Characters/player/clothes/roseradeM/clothes_bike_roseradeM.png differ
diff --git a/Graphics/Characters/player/clothes/roseradeM/clothes_walk_roseradeM.png b/Graphics/Characters/player/clothes/roseradeM/clothes_walk_roseradeM.png
index 71494f1e1..3bd68b0a8 100644
Binary files a/Graphics/Characters/player/clothes/roseradeM/clothes_walk_roseradeM.png and b/Graphics/Characters/player/clothes/roseradeM/clothes_walk_roseradeM.png differ
diff --git a/Graphics/Characters/player/hair/marshawk/CHANGES NEEDED.docx b/Graphics/Characters/player/hair/marshawk/CHANGES NEEDED.docx
index 63d490954..2f1e54492 100644
Binary files a/Graphics/Characters/player/hair/marshawk/CHANGES NEEDED.docx and b/Graphics/Characters/player/hair/marshawk/CHANGES NEEDED.docx differ
diff --git a/Graphics/Characters/player/hair/pompadour/hair_trainer_1_pompadour.png b/Graphics/Characters/player/hair/pompadour/hair_trainer_1_pompadour.png
index 483de7abf..fd937346d 100644
Binary files a/Graphics/Characters/player/hair/pompadour/hair_trainer_1_pompadour.png and b/Graphics/Characters/player/hair/pompadour/hair_trainer_1_pompadour.png differ
diff --git a/Graphics/Characters/player/hair/pompadour/hair_trainer_2_pompadour.png b/Graphics/Characters/player/hair/pompadour/hair_trainer_2_pompadour.png
index 5e286a1e3..296daaab3 100644
Binary files a/Graphics/Characters/player/hair/pompadour/hair_trainer_2_pompadour.png and b/Graphics/Characters/player/hair/pompadour/hair_trainer_2_pompadour.png differ
diff --git a/Graphics/Characters/player/hair/pompadour/hair_trainer_3_pompadour.png b/Graphics/Characters/player/hair/pompadour/hair_trainer_3_pompadour.png
index c8ffa41ba..13e0d65c0 100644
Binary files a/Graphics/Characters/player/hair/pompadour/hair_trainer_3_pompadour.png and b/Graphics/Characters/player/hair/pompadour/hair_trainer_3_pompadour.png differ
diff --git a/Graphics/Characters/player/hair/pompadour/hair_trainer_4_pompadour.png b/Graphics/Characters/player/hair/pompadour/hair_trainer_4_pompadour.png
index e2cf3f81f..88e9ab4ba 100644
Binary files a/Graphics/Characters/player/hair/pompadour/hair_trainer_4_pompadour.png and b/Graphics/Characters/player/hair/pompadour/hair_trainer_4_pompadour.png differ
diff --git a/Graphics/Characters/player/hair/shortbeard/hair_1_shortbeard.png b/Graphics/Characters/player/hair/shortbeard/hair_1_shortbeard.png
new file mode 100644
index 000000000..30fcaa02d
Binary files /dev/null and b/Graphics/Characters/player/hair/shortbeard/hair_1_shortbeard.png differ
diff --git a/Graphics/Characters/player/hair/shortbeard/hair_2_shortbeard.png b/Graphics/Characters/player/hair/shortbeard/hair_2_shortbeard.png
new file mode 100644
index 000000000..fa52f33db
Binary files /dev/null and b/Graphics/Characters/player/hair/shortbeard/hair_2_shortbeard.png differ
diff --git a/Graphics/Characters/player/hair/shortbeard/hair_3_shortbeard.png b/Graphics/Characters/player/hair/shortbeard/hair_3_shortbeard.png
new file mode 100644
index 000000000..382681078
Binary files /dev/null and b/Graphics/Characters/player/hair/shortbeard/hair_3_shortbeard.png differ
diff --git a/Graphics/Characters/player/hair/shortbeard/hair_4_shortbeard.png b/Graphics/Characters/player/hair/shortbeard/hair_4_shortbeard.png
new file mode 100644
index 000000000..49b759b96
Binary files /dev/null and b/Graphics/Characters/player/hair/shortbeard/hair_4_shortbeard.png differ
diff --git a/Graphics/Characters/player/hair/shortbeard/hair_trainer_1_shortbeard.png b/Graphics/Characters/player/hair/shortbeard/hair_trainer_1_shortbeard.png
new file mode 100644
index 000000000..7988d2e1d
Binary files /dev/null and b/Graphics/Characters/player/hair/shortbeard/hair_trainer_1_shortbeard.png differ
diff --git a/Graphics/Characters/player/hair/shortbeard/hair_trainer_2_shortbeard.png b/Graphics/Characters/player/hair/shortbeard/hair_trainer_2_shortbeard.png
new file mode 100644
index 000000000..b334c97e4
Binary files /dev/null and b/Graphics/Characters/player/hair/shortbeard/hair_trainer_2_shortbeard.png differ
diff --git a/Graphics/Characters/player/hair/shortbeard/hair_trainer_3_shortbeard.png b/Graphics/Characters/player/hair/shortbeard/hair_trainer_3_shortbeard.png
new file mode 100644
index 000000000..b41df17b7
Binary files /dev/null and b/Graphics/Characters/player/hair/shortbeard/hair_trainer_3_shortbeard.png differ
diff --git a/Graphics/Characters/player/hair/shortbeard/hair_trainer_4_shortbeard.png b/Graphics/Characters/player/hair/shortbeard/hair_trainer_4_shortbeard.png
new file mode 100644
index 000000000..41eb63add
Binary files /dev/null and b/Graphics/Characters/player/hair/shortbeard/hair_trainer_4_shortbeard.png differ
diff --git a/Graphics/Characters/player/hat/BirthdayCake/Hat_BirthdayCake - Robin Freeman.png b/Graphics/Characters/player/hat/BirthdayCake/Hat_BirthdayCake - Robin Freeman.png
new file mode 100644
index 000000000..bd2175b00
Binary files /dev/null and b/Graphics/Characters/player/hat/BirthdayCake/Hat_BirthdayCake - Robin Freeman.png differ
diff --git a/Graphics/Characters/player/hat/BirthdayCake/Hat_trainer_BirthdayCake - Robin Freeman.png b/Graphics/Characters/player/hat/BirthdayCake/Hat_trainer_BirthdayCake - Robin Freeman.png
new file mode 100644
index 000000000..8629f6441
Binary files /dev/null and b/Graphics/Characters/player/hat/BirthdayCake/Hat_trainer_BirthdayCake - Robin Freeman.png differ
diff --git a/Graphics/Characters/player/hat/FlareonHat/Hat_FlareonHat - Robin Freeman.png b/Graphics/Characters/player/hat/FlareonHat/Hat_FlareonHat - Robin Freeman.png
new file mode 100644
index 000000000..53da8d81b
Binary files /dev/null and b/Graphics/Characters/player/hat/FlareonHat/Hat_FlareonHat - Robin Freeman.png differ
diff --git a/Graphics/Characters/player/hat/FlareonHat/Hat_trainer_FlareonHat - Robin Freeman.png b/Graphics/Characters/player/hat/FlareonHat/Hat_trainer_FlareonHat - Robin Freeman.png
new file mode 100644
index 000000000..3493777db
Binary files /dev/null and b/Graphics/Characters/player/hat/FlareonHat/Hat_trainer_FlareonHat - Robin Freeman.png differ