mixed starters option & legendary mode

.gitignore

@@ -1,7 +1,6 @@
 Graphics/CustomBattlers/local_sprites/*
-Graphics/Pokemon/FusionIcons/*
 Graphics/Battlers/Shiny/*
-
+Graphics/Pokemon/FusionIcons/*
 Graphics/CustomBattlers/spritesheets/*
 Graphics/CustomBattlers/*
 Data/sprites/*

Credits.txt

@@ -107,9 +107,9 @@ casinoluck<s>ymirbot
 
 
 ###################################
-###	Custom Pok?dex entries					###
+###	Custom Pokedex entries					###
 ###################################
-### Pok?dex entries quality control (Unown)
+### Pokedex entries quality control (Unown)
 luvischlo<s>char_latte3412<s>strawbearycandy
 bobosmith01<s>griddle<s>.izik
 knilk<s>lordjoostmeister<s>.realthree
@@ -127,6 +127,10 @@ Maruno (http://pokemonessentials.wikia.com/wiki/Pok%C3%A9mon_Essentials_Wiki)
 ###########################################################
 Playtesting was done by various members of the Discord channel. 
 Special thanks to all of you!
+
+Elite 4 rematch teams
+duskrd<s>anaconja
+
 ###########################################################
 ###			Graphics			  #
 ###########################################################

Data/.idea/vcs.xml

@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/Scripts" vcs="Git" />
   </component>
 </project>

Data/outfits/clothes_data.json

@@ -4,7 +4,7 @@
         "name": "Blue Activewear (F)",
         "description": "A feminine, blue, sporty outfit that's easy to move in. The perfect outfit for an athlete.",
         "len": 90,
-        "done": "yes",
+        "obtainable": "yes",
         "price": 3500,
         "tags": "goldenrod",
         "howToGet": "triathlon quest?"
@@ -14,7 +14,7 @@
         "name": "Blue Activewear (M)",
         "description": "A masculine, blue, sporty outfit that's easy to move in. The perfect outfit for an athlete.",
         "len": 91,
-        "done": "yes",
+        "obtainable": "yes",
         "price": 3500,
         "tags": "goldenrod",
         "howToGet": "triathlon quest?"
@@ -24,7 +24,7 @@
         "name": "Green Activewear (F)",
         "description": "A feminine, green, sporty outfit that's easy to move in. The perfect outfit for an athlete.",
         "len": 91,
-        "done": "yes",
+        "obtainable": "yes",
         "price": 3500,
         "tags": "goldenrod",
         "howToGet": "triathlon quest?"
@@ -34,7 +34,7 @@
         "name": "Green Activewear (M)",
         "description": "A masculine, green, sporty outfit that's easy to move in. The perfect outfit for an athlete.",
         "len": 92,
-        "done": "yes",
+        "obtainable": "yes",
         "price": 3500,
         "tags": "goldenrod",
         "howToGet": "triathlon quest?"
@@ -44,7 +44,7 @@
         "name": "Red Activewear (F)",
         "description": "A feminine, red, sporty outfit that's easy to move in. The perfect outfit for an athlete.",
         "len": 89,
-        "done": "yes",
+        "obtainable": "yes",
         "price": 3500,
         "tags": "goldenrod",
         "howToGet": "triathlon quest?"
@@ -54,7 +54,7 @@
         "name": "Red Activewear (M)",
         "description": "A masculine, red, sporty outfit that's easy to move in. The perfect outfit for an athlete.",
         "len": 90,
-        "done": "yes",
+        "obtainable": "yes",
         "price": 3500,
         "tags": "goldenrod",
         "howToGet": "triathlon quest?"
@@ -64,7 +64,7 @@
         "name": "Adventurer Gear (F)",
         "description": "A rugged feminine outfit, perfect for adventuring out into the wilderness.",
         "len": 74,
-        "done": "yes",
+        "obtainable": "yes",
         "price": 3500,
         "tags": "fuchsia",
         "howToGet": "city exclusive outfit"
@@ -74,7 +74,7 @@
         "name": "Adventurer Gear (M)",
         "description": "A rugged masculine outfit, perfect for adventuring out into the wilderness.",
         "len": 75,
-        "done": "yes",
+        "obtainable": "yes",
         "price": 3500,
         "tags": "fuchsia",
         "howToGet": "city exclusive outfit"
@@ -84,22 +84,16 @@
         "name": "Biker Outfit",
         "description": "A rugged outfit made of leather and jeans. It's often worn by bikers. ",
         "len": 70,
-        "done": "yes",
+        "obtainable": "yes",
         "price": 4500,
         "tags": "celadon",
         "howToGet": "city exclusive outfit"
     },
-    {
-        "id": "breloomcap",
-        "name": "Breloom Cap",
-        "price": 8000,
-        "tags": "pokemon-shroomish,pokemon-breloom"
-    },
     {
         "id": "bughakama",
         "name": "Bug Hakama Dress",
         "description": "A traditionnal looking hakama dress, that captures the essence of bug-type Pokémon, complete with a bug-catching net!",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 10000,
         "tags": "azalea,special,",
         "howToGet": "type trainer"
@@ -108,7 +102,7 @@
         "id": "bughakamapants",
         "name": "Bug Hakama Pants",
         "description": "A traditionnal looking pair of hakama pants that capture the essence of bug-type Pokémon, complete with a bug-catching net!",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 10000,
         "tags": "azalea,special,",
         "howToGet": "type trainer"
@@ -116,6 +110,7 @@
     {
         "id": "butler",
         "name": "Butler Uniform",
+        "obtainable": "yes",
         "price": 5000,
         "tags": "special,"
     },
@@ -124,7 +119,7 @@
         "name": "Business Suit",
         "description": "A classy, professional-looking business suit.",
         "len": 45,
-        "done": "yes",
+        "obtainable": "yes",
         "price": 6000,
         "tags": "saffron"
     },
@@ -132,7 +127,7 @@
         "id": "cardigandress",
         "name": "Cardigan Dress",
         "description": "A brown cardigan worn over a white shirt with a skirt for a clean and professional appearance.",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 2000,
         "tags": "default"
     },
@@ -141,7 +136,7 @@
         "name": "Black Cloak Dress",
         "description": "A mysterious long black cloak or dress, worn over black leggings.",
         "len": 65,
-        "done": "yes",
+        "obtainable": "yes",
         "price": 6500,
         "tags": "lavender,",
         "howToGet": "city exclusive outfit"
@@ -150,7 +145,7 @@
         "id": "cresseliadress",
         "name": "Lunar Dress",
         "description": "A whimsical dress that is inspired by the legendary Pokémon Cresselia.",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 25000,
         "tags": "pokemon-cresselia"
     },
@@ -158,6 +153,7 @@
         "id": "darkoutfit",
         "name": "Dark Outfit",
         "description": "A sinister outfit for those who thrive in the darkness. It captures the essence of Dark-type Pokémon.",
+        "obtainable": "yes",
         "price": 10000,
         "tags": "type-dark,special"
     },
@@ -165,12 +161,14 @@
         "id": "deadlypoisondanger",
         "name": "Poison Outfit",
         "description": "A noxious-looking outfit for those who handle deadly poisons. It captures the essence of Poison-type Pokémon.",
+        "obtainable": "yes",
         "price": 10000,
         "tags": "type-poison,special"
     },
     {
         "id": "delinquentoutfit",
         "name": "Delinquent Outfit",
+        "obtainable": "yes",
         "price": 8000,
         "tags": "violet,",
         "howToGet": "city exclusive outfit"
@@ -179,6 +177,7 @@
         "id": "dragonconqueror",
         "name": "Dragon Outfit",
         "description": "The extravagant outfit of a conquerer. It captures the essence of Dragon-type Pokémon.",
+        "obtainable": "yes",
         "price": 10000,
         "tags": "type-dragon,special"
     },
@@ -187,7 +186,7 @@
         "name": "Electric Outfit",
         "description": "A casual outfit themed around the Electric type.",
         "len": 48,
-        "done": "yes",
+        "obtainable": "yes",
         "price": 10000,
         "tags": "type-electric,special"
     },
@@ -195,7 +194,7 @@
         "id": "emeraldSPE",
         "name": "Emerald Gear",
         "description": "A floaty jacket inspired by the color scheme of Spinarak.",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 6000,
         "tags": "azalea,pokemon-spinarak,pokemon-ariados,",
         "howToGet": "found at sky pillar"
@@ -203,12 +202,13 @@
     {
         "id": "Eri",
         "name": "Caph Squad Captain",
+        "obtainable": "yes",
         "tags": "paldea,"
     },
     {
         "id": "fantasyadventurersoutfit",
         "name": "Traveller Outfit",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 0,
         "tags": "special,",
         "howToGet": "Given by exotic pokemon quest npc after completing all the quests"
@@ -216,6 +216,7 @@
     {
         "id": "fauxwrap",
         "name": "Faux Wrap Dress",
+        "obtainable": "yes",
         "price": 3500,
         "tags": "ecruteak"
     },
@@ -223,20 +224,21 @@
         "id": "fighting",
         "name": "Fighting Outfit",
         "description": "A sportsy outfit that is liked by those who practice martial arts. It captures the essence of Fighting-type Pokémon.",
-        "done": "yes",
+        "obtainable": "yes",
         "tags": "type-fighting,special"
     },
     {
         "id": "fire",
         "name": "Fire Outfit",
         "description": "A fire-proof outfit that captures the essence of fire-type Pokémon.",
+        "obtainable": "yes",
         "tags": "type-fire,special"
     },
     {
         "id": "floraldress",
         "name": "Floral Dress",
         "description": "A sleeveless dress adorned with a vibrant floral pattern.",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 3500,
         "tags": "celadon",
         "howToGet": "city-exclusive outfit"
@@ -245,7 +247,7 @@
         "id": "flowerjumper",
         "name": "Flower Jumper",
         "description": "A jumper suit with a beautiful floral pattern.",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 4000,
         "tags": "celadon",
         "howToGet": "city-exclusive outfit"
@@ -254,13 +256,14 @@
         "id": "flying",
         "name": "Flying Outfit",
         "description": "An aerodynamic outfit for gliding through the air.  It captures the essence of Flying-type Pokémon.",
+        "obtainable": "yes",
         "price": 10000,
         "tags": "type-flying,special"
     },
     {
         "id": "fusionnerd",
         "name": "Fusion Outfit",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 0,
         "tags": "pokemon-fused,special,",
         "howToGet": "cinnabar lab after fusing 100 times"
@@ -273,7 +276,8 @@
     },
     {
         "id": "glitzerset",
-        "name": "Glitzer",
+        "name": "Bad Egg Outfit",
+        "obtainable": "yes",
         "price": 2550,
         "tags": "special,"
     },
@@ -281,14 +285,22 @@
         "id": "gothhoodie",
         "name": "Goth Hoodie",
         "description": "A dark, oversized hoodie with a skull emblem, paired with ripped leggings for expressing your inner rebel.",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 3500,
         "tags": "lavender"
     },
+    {
+        "id": "grassexpert",
+        "name": "Grass Outfit",
+        "price": 10000,
+        "tags": "type-grass,special",
+        "howToGet": "typetrainer"
+    },
     {
         "id": "groundcowboy",
         "name": "Ground Outfit",
         "description": "A rugged cowboy outfit with earthy tones that captures the essence of the Ground type.",
+        "obtainable": "yes",
         "price": 10000,
         "tags": "type-ground",
         "howToGet": "type trainer"
@@ -298,6 +310,7 @@
         "name": "Gymwear",
         "description": "Form fitting gym clothes that accentuate a trainer's rippling musculature.",
         "len": 74,
+        "obtainable": "yes",
         "price": 15000,
         "tags": "pokemon-machop,pokemon-machoke,pokemon-machamp",
         "howToGet": "type trainer"
@@ -307,7 +320,7 @@
         "name": "Happiny Costume",
         "description": "A pink outfit with white eggs, made to ressemble a Happiny costume.",
         "len": 67,
-        "done": "yes",
+        "obtainable": "yes",
         "price": 15000,
         "tags": "pokemon-happiny,pokemon-chansey,pokemon-blissey"
     },
@@ -316,7 +329,7 @@
         "name": "Hex Maniac Dress",
         "description": "A dark purple vintage dress. It's often worn by Hex Maniacs.",
         "len": 60,
-        "done": "yes",
+        "obtainable": "yes",
         "price": 3500,
         "tags": "lavender",
         "howToGet": "city-exclusive outfit"
@@ -325,7 +338,7 @@
         "id": "ho-oh",
         "name": "Rainbow Outfit",
         "description": "A vibrant, colorfoul outfit inspired by the legendary Pokémon Ho-Oh.",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 25000,
         "tags": "pokemon-hooh",
         "howToGet": "saffron boutique exclusive"
@@ -334,21 +347,28 @@
         "id": "hoodie",
         "name": "Hoodie",
         "description": "A cozy hoodie, perfect for a laid-back trainer who likes to keep things casual.",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 2000,
         "tags": "default"
     },
     {
         "id": "iceoutfit",
         "name": "Ice Outfit",
+        "obtainable": "yes",
         "price": 10000,
         "tags": "type-ice,"
     },
+    {
+        "id": "idolf",
+        "name": "Idol Dress",
+        "price": 7500
+    },
     {
         "id": "indigoicebeams",
         "name": "Hockey Jersey",
         "description": "An outfit themed around the Indigo Ice Beams hockey team. Go Indigos!",
         "len": 69,
+        "obtainable": "yes",
         "price": 4500,
         "tags": "mahogany",
         "howToGet": "city-exclusive outfit"
@@ -357,6 +377,7 @@
         "id": "klara",
         "name": "Toxic Idol Coat",
         "description": "A stylish puffy coat that was popularized by a poison-type Gym leader from Galar.",
+        "obtainable": "yes",
         "price": 8000,
         "tags": "galar"
     },
@@ -364,6 +385,7 @@
         "id": "kris",
         "name": "Crystal Classic",
         "description": "A popular Johtonian outfit worn by aspiring female trainers.",
+        "obtainable": "yes",
         "price": 4000,
         "tags": "johto",
         "howToGet": "regional"
@@ -372,7 +394,7 @@
         "id": "lady",
         "name": "Elegant Dress",
         "description": "An elegant summer dress with a ribbon at the waist, radiating a sense of grace and sophistication.",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 1500,
         "tags": "cerulean",
         "howToGet": "city-exclusive outfit"
@@ -381,7 +403,7 @@
         "id": "lass",
         "name": "Yellow School Dress",
         "description": "A yellow blouse with puffed sleeves and a black skirt, styled as a traditional school uniform.",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 1500,
         "tags": "pewter",
         "howToGet": "city-exclusive outfit"
@@ -390,7 +412,7 @@
         "id": "lass2",
         "name": "Blue School Dress",
         "description": "A white blouse with puffed sleeves and a blue skirt, styled as a traditional school uniform.",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 1500,
         "tags": "cerulean",
         "howToGet": "city-exclusive outfit"
@@ -400,7 +422,7 @@
         "name": "Tank Top & Skirt",
         "description": "Your favourite blue tank and red skirt that you always wear on adventures!",
         "len": 74,
-        "done": "yes",
+        "obtainable": "yes",
         "price": 0,
         "tags": "special,",
         "howToGet": "starting outfit"
@@ -409,7 +431,7 @@
         "id": "longshirtskirt",
         "name": "Long Shirt & Skirt",
         "description": "A casual long shirt that's colored like a Pokéball, worn with a black frilled skirt.",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 2000,
         "tags": "default",
         "howToGet": "default outfit in shops"
@@ -419,7 +441,7 @@
         "name": "Red Pinafore",
         "description": "A bright red pinafore worn over a white shirt.",
         "len": 46,
-        "done": "yes",
+        "obtainable": "yes",
         "price": 3500,
         "tags": "vermillion",
         "howToGet": "city-exclusive outfit"
@@ -427,18 +449,26 @@
     {
         "id": "lycanrochooddown",
         "name": "Lycanroc Coat (Hooded)",
+        "obtainable": "yes",
         "price": 18000,
         "tags": "pokemon-rockruff,pokemon-lycanroc_d,pokemon-lycanroc_n,"
     },
     {
         "id": "lycanrochoodup",
         "name": "Lycanroc Coat",
+        "obtainable": "yes",
         "price": 18000,
         "tags": "pokemon-rockruff,pokemon-lycanroc_d,pokemon-lycanroc_n,"
     },
+    {
+        "id": "magmaRSE",
+        "name": "Magma Uniform",
+        "price": 15000
+    },
     {
         "id": "maid",
         "name": "Maid Uniform",
+        "obtainable": "yes",
         "price": 5000,
         "tags": "special,"
     },
@@ -446,7 +476,7 @@
         "id": "marshweater",
         "name": "Marshweater",
         "description": "A comfortable sweater designed to look like a Marshtomp.",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 15000,
         "tags": "pokemon-mudkip,pokemon-marshtomp,pokemon-swampert,"
     },
@@ -454,7 +484,7 @@
         "id": "mikufairyf",
         "name": "Fairy Outfit (F)",
         "description": "A whimsical pastel sweater and skirt that capture the essence of the Fairy type.",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 10000,
         "tags": "type-fairy,special,",
         "howToGet": "type trainer (fairy)"
@@ -463,7 +493,7 @@
         "id": "mikufairym",
         "name": "Fairy Outfit (M)",
         "description": "A light pastel sweater and tailored pants that capture the essence of the Fairy type.",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 10000,
         "tags": "type-fairy,special,",
         "howToGet": "type trainer (fairy)"
@@ -472,15 +502,22 @@
         "id": "normal",
         "name": "Normal Outfit",
         "description": "A brown jacket with a scarf that capture the essence of the Normal-type.",
+        "obtainable": "yes",
         "price": 10000,
         "tags": "type-normal,special,"
     },
+    {
+        "id": "nursejoy",
+        "name": "Nurse Uniform",
+        "price": 18000,
+        "tags": "special,"
+    },
     {
         "id": "officeworkerf",
         "name": "Office Worker (F)",
         "description": "A classy, professional-looking pink business suit and pencil skirt.",
         "len": 67,
-        "done": "yes",
+        "obtainable": "yes",
         "price": 3000,
         "howToGet": "found in silph. co"
     },
@@ -488,7 +525,7 @@
         "id": "officeworkerm",
         "name": "Office Worker (M)",
         "description": "A sharp white button-up shirt with a tie that offers a polished and professional look.",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 3000,
         "howToGet": "found in silph. co"
     },
@@ -497,7 +534,7 @@
         "name": "Pink Pyjamas",
         "description": "Comfy pink pyjamas with a Poké Ball logo on the shirt.",
         "len": 54,
-        "done": "yes",
+        "obtainable": "yes",
         "price": 2000,
         "tags": "default",
         "howToGet": "starting outfit?"
@@ -507,7 +544,7 @@
         "name": "Pikachu Pyjamas",
         "description": "Comfy blue pyjamas with a Pikachu print.",
         "len": 40,
-        "done": "yes",
+        "obtainable": "yes",
         "price": 0,
         "tags": "pokemon-pichu,pokemon-pikachu,pokemon-raichu,",
         "howToGet": "starting outfit?"
@@ -516,14 +553,14 @@
         "id": "pikaonesie",
         "name": "Pikachu Onesie",
         "description": "A cozy onesie designed to look like Pikachu.",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 4000,
         "howToGet": "bill"
     },
     {
         "id": "PKMBreeder",
         "name": "Breeder Outfit",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 15000,
         "tags": "special,",
         "howToGet": "Quest"
@@ -531,7 +568,7 @@
     {
         "id": "poison",
         "name": "Venomous Vest (M)",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 3500,
         "tags": "azalea,",
         "howToGet": "city-exclusive outfit"
@@ -539,6 +576,7 @@
     {
         "id": "poison2",
         "name": "Poison Outfit",
+        "obtainable": "yes",
         "price": 15000,
         "tags": "fuchsia,",
         "howToGet": "type trainer"
@@ -546,22 +584,17 @@
     {
         "id": "poisonf",
         "name": "Venomous Vest (F)",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 3500,
         "tags": "azalea,",
         "howToGet": "city-exclusive outfit"
     },
-    {
-        "id": "pumpkaboohelmet",
-        "name": "Pumpkaboo Helmet",
-        "description": "A hollowed out pumpkin that looks like a Pumpkaboo!",
-        "price": 1031,
-        "tags": "pokemon-pumpkaboo,pokemon-gourgeist,"
-    },
     {
         "id": "Ramos",
         "name": "Gardener Outfit",
         "description": "An outfit worn by gardeners. It was popularized by a certain Gym Leader from the Kalos region.",
+        "obtainable": "yes",
+        "price": 4500,
         "tags": "kalos,",
         "howToGet": "regional set"
     },
@@ -570,7 +603,7 @@
         "name": "Red jacket and Jeans",
         "description": "Your favourite red jacket and jeans that you always wear on adventures!",
         "len": 71,
-        "done": "yes",
+        "obtainable": "yes",
         "price": 0,
         "howToGet": "starting outfit"
     },
@@ -578,7 +611,7 @@
         "id": "richboy",
         "name": "Luxury Suit (Light)",
         "description": "A sharp, white suit that screams luxury and confidence for trainers who likes to win in style.",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 3500,
         "tags": "goldenrod",
         "howToGet": "city-exclusive outfit"
@@ -587,7 +620,7 @@
         "id": "richboy2",
         "name": "Luxury Suit (Dark)",
         "description": "A sharp, dark suit that screams luxury and confidence for trainers who likes to win in style.",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 3500,
         "tags": "goldenrod",
         "howToGet": "city-exclusive outfit"
@@ -597,7 +630,7 @@
         "name": "Team Rocket Uniform (F)",
         "description": "The feminine version of the Team Rocket uniform every Grunt wears.",
         "len": 66,
-        "done": "yes",
+        "obtainable": "yes",
         "price": 0,
         "howToGet": "nugget bridge recruiter"
     },
@@ -606,7 +639,7 @@
         "name": "Team Rocket Uniform (M)",
         "description": "The masculine version of the Team Rocket uniform every Grunt wears.",
         "len": 67,
-        "done": "yes",
+        "obtainable": "yes",
         "price": 0,
         "howToGet": "nugget bridge recruiter"
     },
@@ -615,7 +648,7 @@
         "name": "Roserade Suit (F)",
         "description": "A feminine green suit resembling a Roserade.",
         "len": 44,
-        "done": "yes",
+        "obtainable": "yes",
         "price": 12000,
         "tags": "pokemon-budew,pokemon-roserade,pokemon-roselia,celadon"
     },
@@ -624,13 +657,14 @@
         "name": "Roserade Suit (M)",
         "description": "A masculine green suit resembling a Roserade.",
         "len": 45,
-        "done": "yes",
+        "obtainable": "yes",
         "price": 12000,
         "tags": "pokemon-budew,pokemon-roserade,pokemon-roselia,celadon"
     },
     {
         "id": "sada",
         "name": "Primitive Clothes (F)",
+        "obtainable": "yes",
         "price": 10000,
         "tags": "special",
         "howToGet": "fossil guy final"
@@ -638,6 +672,7 @@
     {
         "id": "sado",
         "name": "Primitive Clothes (M)",
+        "obtainable": "yes",
         "price": 10000,
         "tags": "special",
         "howToGet": "fossil guy final"
@@ -646,7 +681,7 @@
         "id": "sandshrewoutfit",
         "name": "Sandshrew Outfit",
         "description": "A pants and cape set designed with a texture mimicking Sandshrew's hide that allows you to easily blend in with desert environments.",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 12000,
         "tags": "pokemon-sandshrew,pokemon-sandslash,"
     },
@@ -654,23 +689,16 @@
         "id": "slowsuit",
         "name": "Slow Suit",
         "description": "The ultimate chill costume, complete with a giant shell chomping on your tail.",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 12000,
         "tags": "pokemon-slowpoke,pokemon-slowbro,pokemon-slowking"
     },
-    {
-        "id": "sneaselfeather",
-        "name": "Sharp Feather",
-        "description": "A feather worn on the head that ressembles the ear of a Sneasel.",
-        "price": 4000,
-        "tags": "pokemon-sneasel,pokemon-weavile,"
-    },
     {
         "id": "SnowCoatFemale",
         "name": "Blue Snow Coat (F)",
         "description": "A warm blue coat, red skirt, leggins and boots, perfect for cold weather.",
         "len": 73,
-        "done": "yes",
+        "obtainable": "yes",
         "price": 5000,
         "tags": "mahogany,crimson,",
         "howToGet": "given by npc at the gap at the ice mountains, or sold at a lil stand there?"
@@ -680,15 +708,25 @@
         "name": "Red Snow Coat (M)",
         "description": "A warm red coat, jeans and boots, perfect for cold weather.",
         "len": 59,
-        "done": "yes",
+        "obtainable": "yes",
         "price": 5000,
         "tags": "mahogany,crimson,",
         "howToGet": "given by npc at the gap at the ice mountains, or sold at a lil stand there?"
     },
+    {
+        "id": "RocketJames",
+        "name": "White Rocket Uniform (M)",
+        "tags": "special"
+    },
+    {
+        "id": "RocketJessie",
+        "name": "White Rocket Uniform (F)",
+        "tags": "special"
+    },
     {
         "id": "splicer",
         "name": "Splicer Outfit",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 10000,
         "tags": "pokemon-fused"
     },
@@ -697,7 +735,7 @@
         "name": "Black Shirt & Jeans",
         "description": "Black jeans and a black shirt with a Poké Ball on the front.",
         "len": 60,
-        "done": "yes",
+        "obtainable": "yes",
         "price": 2000,
         "tags": "default",
         "howToGet": "starting outfit?"
@@ -706,7 +744,7 @@
         "id": "steelworkerF",
         "name": "Steel Outfit (F)",
         "description": "A sturdy jumpsuit giving off a strong, industrial vibe that captures the essence of the Steel type.",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 10000,
         "tags": "type-steel,special",
         "howToGet": "type trainer (steel)"
@@ -715,7 +753,7 @@
         "id": "steelworkerM",
         "name": "Steel Outfit (M)",
         "description": "A rugged jumpsuit giving off a strong, industrial vibe that captures the essence of the Steel type.",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 10000,
         "tags": "type-steel,special",
         "howToGet": "type trainer (steel)"
@@ -724,20 +762,21 @@
         "id": "summerdress",
         "name": "Summer Dress",
         "description": "A light, breezy summer dress, perfect for strolls in sunny fields or along the beach.",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 1500,
         "tags": "default"
     },
     {
         "id": "trevenantforestkingcloak",
         "name": "Forest King Cloak",
+        "obtainable": "yes",
         "price": 25000,
         "tags": "pokemon-phantump,pokemon-trevenant,"
     },
     {
         "id": "urbanelectric",
         "name": "Electric Outfit",
-        "done": "yes",
+        "obtainable": "yes",
         "price": 10000,
         "tags": "type-electric,special,",
         "howToGet": "type trainer"
@@ -747,7 +786,7 @@
         "name": "Veteran Trenchcoat",
         "description": "A heavy black trenchcoat, often worn by Veteran trainers.",
         "len": 57,
-        "done": "yes",
+        "obtainable": "yes",
         "price": 22000,
         "tags": "crimson"
     },
@@ -755,6 +794,7 @@
         "id": "waterdress",
         "name": "Water Dress",
         "description": "A stylish dress that captures the essence of Water-type Pokémon.",
+        "obtainable": "yes",
         "price": 10000,
         "tags": "type-water,special",
         "howToGet": "type trainer"
@@ -764,7 +804,7 @@
         "name": "Yellow Qipao",
         "description": "A yellow qipao worn over pants. It's popular with fledgling trainers in Kanto.",
         "len": 78,
-        "done": "yes",
+        "obtainable": "yes",
         "price": 3000,
         "tags": "pewter"
     },
@@ -772,6 +812,7 @@
         "id": "youngster",
         "name": "Youngster Outfit",
         "description": "An orange tank top and shorts that's often worn by youngsters around the region.",
+        "obtainable": "yes",
         "price": 1500,
         "tags": "pewter",
         "howToGet": "city-exclusive outfit"

Data/outfits/hairstyles_data.json

@@ -238,6 +238,13 @@
         "price": 5000,
         "howToGet": "saffron boutique"
     },
+    {
+        "id": "idolf",
+        "name": "Demi Bob",
+        "description": "A soft, short bob with a glamorous edge.",
+        "price": 500,
+        "tags": "saffron"
+    },
     {
         "id": "janine",
         "name": "Spiky Ponytail",
@@ -310,6 +317,7 @@
         "id": "leafeonbob",
         "name": "Verdant Bob",
         "description": "A peculiar hairstyle that's meant to resembles the leaves of a Leafeon.",
+        "done": "yes",
         "price": 3000,
         "tags": "pokemon,"
     },
@@ -352,6 +360,7 @@
         "id": "lunarbob",
         "name": "Lunar Cut",
         "description": "A bob cut shaped like a crescent moon, with a sleek, curved silhouette.",
+        "done": "yes",
         "price": 5000,
         "tags": "special",
         "howToGet": "quest? cresselia outfit"
@@ -360,6 +369,7 @@
         "id": "lycanrocshorthair",
         "name": "Lupine Cut",
         "description": "A sleek cut that is reminiscent of a Lycanroc's mane",
+        "done": "yes",
         "price": 3000,
         "tags": "special"
     },
@@ -367,6 +377,7 @@
         "id": "lyra",
         "name": "Peppy Pigtails",
         "description": "Bouncy pigtails with a playful charm that gives off a carefree vibes.",
+        "done": "yes",
         "price": 1500,
         "tags": "johto,"
     },
@@ -448,6 +459,7 @@
         "id": "mullet",
         "name": "Mullet",
         "description": "Business in the front, party in the back!",
+        "done": "yes",
         "price": 500,
         "tags": "vermillion"
     },
@@ -471,6 +483,20 @@
         "tags": "long, tied, spiky, thick, npc,unova,",
         "howToGet": "protag special - unlocked after quest, show a Pokemon from unova"
     },
+    {
+        "id": "nursejoy",
+        "name": "Joyful Puffs",
+        "description": "Neatly coiled twin buns perched high on each side, radiating care and warmth.",
+        "price": 5000,
+        "tags": "special"
+    },
+    {
+        "id": "nursejoyalt",
+        "name": "Side Joyful Puff",
+        "description": "A single coiled bun perched high on one side, radiating care and warmth.",
+        "price": 5000,
+        "tags": "special"
+    },
     {
         "id": "officeworkerF",
         "name": "Waist-Length Hair",
@@ -481,6 +507,13 @@
         "tags": "long, untied, smooth,saffron,",
         "howToGet": "Saffron city special"
     },
+    {
+        "id": "oricoriopuffs",
+        "name": "Pom-Pom Puffs",
+        "description": "Big, bubbly twin puffs bursting with cheer!",
+        "price": 500,
+        "tags": "special"
+    },
     {
         "id": "painter",
         "name": "Soft Side Bangs",
@@ -509,9 +542,18 @@
     {
         "id": "pompadour",
         "name": "Pompadour",
+        "description": "A dramatic, swept-back hairstyle with towering volume at the front.",
         "price": 2000,
         "tags": "violet,"
     },
+    {
+        "id": "punktails",
+        "name": "Punk Tails",
+        "description": "High, wild twin ponytails bursting with volume and rebellion.",
+        "done": "yes",
+        "price": 500,
+        "tags": "celadon"
+    },
     {
         "id": "red",
         "name": "Short Hat Hair",

Data/outfits/hats_data.json

@@ -15,6 +15,20 @@
         "tags": "hat,pokemon-aerodactyl,type-fossil",
         "howToGet": "random drop from rock smash? "
     },
+    {
+        "id": "aquaclip",
+        "name": "Aqua Clip",
+        "price": 3000,
+        "tags": "hairclip"
+    },
+    {
+        "id": "aronmask",
+        "name": "Aron Mask",
+        "description": "A heavy, steel mask shaped like the head of an Aron.",
+        "done": "yes",
+        "price": 6500,
+        "tags": "mask,pokemon-aron,pokemon-lairon,pokemon-aggron"
+    },
     {
         "id": "ash",
         "name": "Partner Cap",
@@ -75,6 +89,13 @@
         "tags": "mask,",
         "howToGet": "randomly found in trash cans"
     },
+    {
+        "id": "brawlyshades",
+        "name": "Brawl Shades",
+        "description": "Sporty shades that were popularized by a certain Gym Leader from the Hoenn region.",
+        "price": 4000,
+        "tags": "glasses,hoenn,"
+    },
     {
         "id": "breederbandana",
         "name": "Breeder Bandana",
@@ -95,6 +116,12 @@
         "tags": "headband,",
         "howToGet": "reward for hatching x number of eggs? for getting every baby mon?"
     },
+    {
+        "id": "breloomcap",
+        "name": "Breloom Cap",
+        "price": 8000,
+        "tags": "pokemon-shroomish,pokemon-breloom"
+    },
     {
         "id": "brendanORAS",
         "name": "Sporty Cap",
@@ -415,6 +442,19 @@
         "tags": "hat, cinnabar,",
         "howToGet": "type trainer"
     },
+    {
+        "id": "flameclip",
+        "name": "Flame Clip",
+        "price": 3000,
+        "tags": "hairclip,"
+    },
+    {
+        "id": "flannerybeanie",
+        "name": "Flaming Beanie",
+        "description": "A snug black beanie with bright, flickering flame patterns licking the sides.",
+        "price": 12000,
+        "tags": "hat,weather-cold,"
+    },
     {
         "id": "froghat",
         "name": "Frog Hat",
@@ -453,6 +493,13 @@
         "tags": "mask,special,",
         "howToGet": "Obtained by defeating a Pokemon without a sprite"
     },
+    {
+        "id": "glaliehelmet",
+        "name": "Glalie Helmet",
+        "description": "A sturdy helmet made of compacted ice that looks like a Glalie!",
+        "price": 8000,
+        "tags": "hat,pokemon-snorunt,pokemon-glalie,pokemon-froslass,"
+    },
     {
         "id": "glasses",
         "name": "Round Glasses",
@@ -512,6 +559,14 @@
         "tags": "hat,trainer,johto,",
         "howToGet": "regional set"
     },
+    {
+        "id": "grassexpert",
+        "name": "Flower Crown",
+        "description": "A delicate crown woven from vibrant wildflowers. It gives off a fresh, natural vibe.",
+        "done": "yes",
+        "price": 5000,
+        "tags": "hat,headband,weather-warm,"
+    },
     {
         "id": "halo",
         "name": "Halo",
@@ -529,6 +584,14 @@
         "price": 8000,
         "tags": "pokemon-axew,pokemon-fraxure,pokemon-haxorus,"
     },
+    {
+        "id": "hawluchamask",
+        "name": "Lucha Mask",
+        "description": "A Lucha Libre mask that looks like the one worm by a Hawlucha.",
+        "done": "yes",
+        "price": 5000,
+        "tags": "pokemon-hawlucha,mask,"
+    },
     {
         "id": "headlacecovering",
         "name": "Lace Covering",
@@ -626,13 +689,19 @@
         "tags": "hat,trainer,unova,",
         "howToGet": "regional set"
     },
+    {
+        "id": "idolf",
+        "name": "Heart Headband",
+        "price": 4500,
+        "tags": "headband,goldenrod"
+    },
     {
         "id": "karateHeadband",
         "name": "Karate Bandana",
         "description": "A red headband tied tightly around the forehead. It’s worn by trainers who strive for discipline and strength.",
         "done": "yes",
         "price": 6000,
-        "tags": "headband,saffron,",
+        "tags": "headband,saffron,pokemon-luvdisc,",
         "howToGet": "type trainer"
     },
     {
@@ -862,6 +931,20 @@
         "tags": "hat,trainer,unova,",
         "howToGet": "left behind by the zoroark in berry forest? regional set"
     },
+    {
+        "id": "ninetalesalolahat",
+        "name": "Ice Fox Hat",
+        "price": 7500,
+        "tags": "hat,pokemon-alolan_vulpix,pokemon-alolan_ninetales,weather-cold"
+    },
+    {
+        "id": "nursejoy",
+        "name": "Blank Nurse Cap",
+        "description": "A white hat that decidedly does not violite the Geneva Convention. It's usually worn by nurses",
+        "price": 25000,
+        "tags": "hat,pokemon-happiny,pokemon-chansey,pokemon-blissey",
+        "howToGet": "quest in a broken down pokecenter, gotta help heal up a bunch of mons that are in critical condition (give potions etc to npc mons)? "
+    },
     {
         "id": "nursejoyhat",
         "name": "Nurse Cap",
@@ -869,7 +952,7 @@
         "len": 97,
         "price": 25000,
         "tags": "hat,pokemon-happiny,pokemon-chansey,pokemon-blissey",
-        "howToGet": "quest in a broken down pokecenter, gotta help heal up a bunch of mons that are in critical condition (give potions etc to npc mons)? "
+        "howToGet": ";"
     },
     {
         "id": "nya",
@@ -924,7 +1007,7 @@
     {
         "id": "orange",
         "name": "Oran Berry",
-        "description": "Just an Oran Berry that's balanced on your head. Simplicity at its best!",
+        "description": "Just an oran berry that's balanced on your head. Simplicity at its best!",
         "price": 1000,
         "tags": "hat,"
     },
@@ -1031,6 +1114,13 @@
         "tags": "mask,pokemon-glalie,type-ice,weather-cold,",
         "howToGet": "gym reward"
     },
+    {
+        "id": "pumpkaboohelmet",
+        "name": "Pumpkaboo Helmet",
+        "description": "A hollowed out pumpkin that looks like a Pumpkaboo!",
+        "price": 1031,
+        "tags": "pokemon-pumpkaboo,pokemon-gourgeist,"
+    },
     {
         "id": "Ramos",
         "name": "Green Flat cap",
@@ -1287,6 +1377,13 @@
         "price": 15000,
         "tags": "hat,pokemon-slowbro,pokemon-slowking,pokemon-shellder"
     },
+    {
+        "id": "sneaselfeather",
+        "name": "Sharp Feather",
+        "description": "A feather worn on the head that ressembles the ear of a Sneasel.",
+        "price": 4000,
+        "tags": "pokemon-sneasel,pokemon-weavile,"
+    },
     {
         "id": "snorlaxhat",
         "name": "Snorlax Hat",
@@ -1304,6 +1401,18 @@
         "price": 12000,
         "tags": "hat,pokemon-snorunt,weather-cold,"
     },
+    {
+        "id": "Spheal",
+        "name": "Head Spheal",
+        "price": 0,
+        "tags": "nest,"
+    },
+    {
+        "id": "Sphealwintercap",
+        "name": "Spheal Toque",
+        "price": 6000,
+        "tags": "hat,weather-cold,pokemon-spheal,pokemon-sealio,pokemon-walrein,"
+    },
     {
         "id": "splicer",
         "name": "Fusion Beret",
@@ -1334,7 +1443,7 @@
     },
     {
         "id": "surgeglasses",
-        "name": "Surge Shades",
+        "name": "Shock Shades",
         "description": "Shockingly cool sunglasses.",
         "done": "yes",
         "len": 27,
@@ -1456,6 +1565,12 @@
         "price": 6500,
         "tags": "hat,fuchsia,"
     },
+    {
+        "id": "winona",
+        "name": "Feathered Cap",
+        "price": 18000,
+        "tags": "hat,"
+    },
     {
         "id": "wooperclips",
         "name": "Wooper Hair Clips",