diff --git a/Data/Map027.rxdata b/Data/Map027.rxdata index 9872236b3..c9c2e8dc9 100644 Binary files a/Data/Map027.rxdata and b/Data/Map027.rxdata differ diff --git a/Data/Map029.rxdata b/Data/Map029.rxdata index e2cfcb9d2..0efe0e60d 100644 Binary files a/Data/Map029.rxdata and b/Data/Map029.rxdata differ diff --git a/Data/Map666.rxdata b/Data/Map666.rxdata index 3ff1e54b7..4e0db452a 100644 Binary files a/Data/Map666.rxdata and b/Data/Map666.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 6eb8a15c1..55cae7219 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/050_Outfits/OutfitIds.rb b/Data/Scripts/050_Outfits/OutfitIds.rb index abba338da..715cc031e 100644 --- a/Data/Scripts/050_Outfits/OutfitIds.rb +++ b/Data/Scripts/050_Outfits/OutfitIds.rb @@ -18,6 +18,9 @@ CLOTHES_FOSSIL_F ="sada" CLOTHES_TREVENANT= "trevenantforestkingcloak" +CLOTHES_WAITRESS = "maid" +CLOTHES_WAITER = "butler" + CLOTHES_LASS_YELLOW ="lass" CLOTHES_LASS_BLUE ="lass2" @@ -69,6 +72,7 @@ HAT_BREEDER_3="egg" HAT_BREEDEROUTFIT="PKMBreeder" +HAT_WAITRESS = "maid" FUSION_HAT = "fusionnerd" FUSION_OUTFIT = "fusionnerd" diff --git a/Data/System.rxdata b/Data/System.rxdata index fbaeacef4..35f7c6fb6 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/outfits/clothes_data.json b/Data/outfits/clothes_data.json index 93a813081..402894a76 100644 --- a/Data/outfits/clothes_data.json +++ b/Data/outfits/clothes_data.json @@ -107,6 +107,12 @@ "tags": "azalea,special,", "howToGet": "type trainer" }, + { + "id": "butler", + "name": "Butler Uniform", + "price": 5000, + "tags": "special," + }, { "id": "BusinessSuit", "name": "Business Suit", @@ -255,7 +261,8 @@ { "id": "glitzerset", "name": "Glitzer", - "price": 2550 + "price": 2550, + "tags": "special," }, { "id": "gothhoodie", @@ -375,6 +382,7 @@ "len": 74, "done": "yes", "price": 0, + "tags": "special,", "howToGet": "starting outfit" }, { @@ -410,8 +418,9 @@ }, { "id": "maid", - "name": "Waitress Uniform", - "price": 5000 + "name": "Maid Uniform", + "price": 5000, + "tags": "special," }, { "id": "marshweater", @@ -596,12 +605,14 @@ "id": "sada", "name": "Primitive Clothes (F)", "price": 10000, + "tags": "special", "howToGet": "fossil guy final" }, { "id": "sado", "name": "Primitive Clothes (M)", "price": 10000, + "tags": "special", "howToGet": "fossil guy final" }, { diff --git a/Data/outfits/hats_data.json b/Data/outfits/hats_data.json index 0122f74a7..679024a39 100644 --- a/Data/outfits/hats_data.json +++ b/Data/outfits/hats_data.json @@ -502,6 +502,13 @@ "tags": "floating,pokemon-shedinja", "howToGet": "reward for beating the ilex forest shedinja encounter? reward for showing a shedinja to someone?" }, + { + "id": "haxorushelmet", + "name": "Jaw Helmet", + "description": "A fearsome helmet crafted in the shape of a Haxorus's jaw. It is sure to intimidate your enemies! ", + "price": 8000, + "tags": "pokemon-axew,pokemon-fraxure,pokemon-haxorus," + }, { "id": "headlacecovering", "name": "Lace Covering", @@ -1318,6 +1325,12 @@ "tags": "hat,trainer,galar,", "howToGet": "trainer clothing store?" }, + { + "id": "voltorbitembarrette", + "name": "Pokéball Barrette", + "price": 1500, + "tags": "hariclip,pokemon-voltorb,pokemon-electrode," + }, { "id": "waterdress", "name": "Straw Hat", diff --git a/Data/sprites/sprites_rate_limit.log b/Data/sprites/sprites_rate_limit.log index f32d97f3f..848c44597 100644 --- a/Data/sprites/sprites_rate_limit.log +++ b/Data/sprites/sprites_rate_limit.log @@ -1,5 +1,2 @@ -1741874456 -1741874457 -1741874460 -1741874466 -1741874489 \ No newline at end of file +1741877280 +1741877284 \ No newline at end of file diff --git a/Data/sprites/updated_spritesheets_cache b/Data/sprites/updated_spritesheets_cache index 91bbd26f3..4eaa2e87d 100644 --- a/Data/sprites/updated_spritesheets_cache +++ b/Data/sprites/updated_spritesheets_cache @@ -487,3 +487,15 @@ Graphics/CustomBattlers/spritesheets/spritesheets_base/324.png Graphics/CustomBattlers/spritesheets/spritesheets_base/278.png Graphics/CustomBattlers/spritesheets/spritesheets_custom/73/73.png Graphics/CustomBattlers/spritesheets/spritesheets_custom/116/116.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/403/403.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/495.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/397.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/397/397.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/36.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/133/133.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/192.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/228.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/400/400.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/146.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/33/33.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/62/62.png diff --git a/Graphics/Characters/player/clothes/gothhoodie/CHANGES NEEDED.docx b/Graphics/Characters/player/clothes/gothhoodie/CHANGES NEEDED.docx index f5f70ccf3..5c70316cc 100644 Binary files a/Graphics/Characters/player/clothes/gothhoodie/CHANGES NEEDED.docx and b/Graphics/Characters/player/clothes/gothhoodie/CHANGES NEEDED.docx differ