diff --git a/contributors.md b/contributors.md index bd7ace88..cc359c74 100644 --- a/contributors.md +++ b/contributors.md @@ -2,16 +2,17 @@ All of the original sprites used in this project were sourced from products by Nintendo/Creatures Inc./GAME FREAK Inc. -All shiny sprites were made by [@Dada78641](https://twitter.com/dada78641) except where otherwise noted. In total, 1636 shiny sprites were made: +All shiny sprites were made by [@Dada78641](https://twitter.com/dada78641) except where otherwise noted. In total, 1738 shiny Pokémon sprites were made: * 938 sprites were made for X/Y, * +29 for the OR/AS update, * +203 for the US/UM update, -* +466 for the LP/LE and SW/SH update. +* +466 for the LP/LE and SW/SH update, +* +102 for the SW/SH DLC update. The [alternate sizes for Pumpkaboo and Gourgeist](https://github.com/msikma/pokesprite/pull/27) were contributed by [@5310](https://github.com/5310). The [Alcremie form variations](https://twitter.com/mattgcn/status/1205639857567141889) were contributed by [@mattgcn](https://twitter.com/mattgcn). -Special thanks to [@koenigderluegner](https://github.com/koenigderluegner) for his help on the LP/LE and SW/SH update and for tagging all the new inventory sprites. +Special thanks to [@koenigderluegner](https://github.com/koenigderluegner) for his help on the LP/LE and SW/SH update (original and DLC) and for tagging all the new inventory sprites. Also, special thanks to anyone who reported issues, gave suggestions or sent in contributions. diff --git a/data/item-map.json b/data/item-map.json index b7d11bce..b31f43cd 100644 --- a/data/item-map.json +++ b/data/item-map.json @@ -865,5 +865,16 @@ "item_1269": "key-item/old-letter", "item_1270": "key-item/band-autograph", "item_1271": "key-item/sonias-book", - "item_1278": "key-item/rotom-catalog" + "item_1278": "key-item/rotom-catalog", + "item_1579": "medicine/max-honey", + "item_1580": "battle-item/max-mushrooms", + "item_1581": "other-item/galarica-twig", + "item_1582": "evo-item/galarica-cuff", + "item_1583": "key-item/style-card", + "item_1584": "key-item/armor-pass", + "item_1585": "key-item/rotom-bike-3", + "item_1586": "key-item/rotom-bike-4", + "item_1587": "key-item/exp-charm", + "item_1588": "other-item/armorite-ore", + "item_1589": "key-item/mark-charm" } diff --git a/data/meta.json b/data/meta.json index 5d3f95f2..06ca5eeb 100644 --- a/data/meta.json +++ b/data/meta.json @@ -201,6 +201,16 @@ "name": { "eng": "Ribbons" } + }, + "mark": { + "name": { + "eng": "Marks" + } + }, + "special-attribute": { + "name": { + "eng": "Special attributes" + } } } } diff --git a/data/misc.json b/data/misc.json index 68566cdf..08829391 100644 --- a/data/misc.json +++ b/data/misc.json @@ -1886,5 +1886,1010 @@ "gen-8": "body-style/head-arms-gen8.png" } } + ], + "mark": [ + { + "id": "53", + "name": { + "eng": "Lunchtime Mark", + "jpn": "しょうごのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Peckish", + "jpn": "はらペコの", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a peckish Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/lunchtime-mark.png" + } + }, + { + "id": "54", + "name": { + "eng": "Sleepy-Time Mark", + "jpn": "しょうしのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Sleepy", + "jpn": "おねむな", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a sleepy Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/sleepy-time-mark.png" + } + }, + { + "id": "55", + "name": { + "eng": "Dusk Mark", + "jpn": "たそがれのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Dozy", + "jpn": "そろそろねむい", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a dozy Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/dusk-mark.png" + } + }, + { + "id": "56", + "name": { + "eng": "Dawn Mark", + "jpn": "あかつきのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Early Riser", + "jpn": "はやくにめざめた", + "jpn_ro": null + }, + "description": { + "eng": "A mark for an early-riser Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/dawn-mark.png" + } + }, + { + "id": "57", + "name": { + "eng": "Cloudy Mark", + "jpn": "どんてんのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Cloud Watcher", + "jpn": "くもをみつめる", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a cloud-watching Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/cloudy-mark.png" + } + }, + { + "id": "58", + "name": { + "eng": "Rainy Mark", + "jpn": "あめふりのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Sodden", + "jpn": "あめにむせぶ", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a sodden Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/rainy-mark.png" + } + }, + { + "id": "59", + "name": { + "eng": "Stormy Mark", + "jpn": "いかづちのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Thunderstruck", + "jpn": "かみなりにさわぐ", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a thunderstruck Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/stormy-mark.png" + } + }, + { + "id": "60", + "name": { + "eng": "Snowy Mark", + "jpn": "こうせつのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Snow Frolicker", + "jpn": "ゆきにころがる", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a snow-frolicking Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/snowy-mark.png" + } + }, + { + "id": "61", + "name": { + "eng": "Blizzard Mark", + "jpn": "ごうせつのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Shivering", + "jpn": "こごえふるえる", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a shivering Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/blizzard-mark.png" + } + }, + { + "id": "62", + "name": { + "eng": "Dry Mark", + "jpn": "かんそうのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Parched", + "jpn": "のどカラカラの", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a parched Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/dry-mark.png" + } + }, + { + "id": "63", + "name": { + "eng": "Sandstorm Mark", + "jpn": "さじんのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Sandswept", + "jpn": "すなにまみれる", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a sandswept Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/sandstorm-mark.png" + } + }, + { + "id": "64", + "name": { + "eng": "Misty Mark", + "jpn": "のうむのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Mist Drifter", + "jpn": "きりにとまどう", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a mist-drifter Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/misty-mark.png" + } + }, + { + "id": "65", + "name": { + "eng": "Destiny Mark", + "jpn": "うんめいのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Chosen One", + "jpn": "うんめいかんじる", + "jpn_ro": null + }, + "description": { + "eng": "A mark of a chosen Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/destiny-mark.png" + } + }, + { + "id": "66", + "name": { + "eng": "Fishing Mark", + "jpn": "つりあげられたあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Catch of the Day", + "jpn": "つりたてピチピチの", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a catch-of-the-day Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/fishing-mark.png" + } + }, + { + "id": "67", + "name": { + "eng": "Curry Mark", + "jpn": "カレーのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Curry Connoisseur", + "jpn": "カレーずきな", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a curry-connoisseur Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/curry-mark.png" + } + }, + { + "id": "68", + "name": { + "eng": "Uncommon Mark", + "jpn": "ときどきみるあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Sociable", + "jpn": "ひとになれてる", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a sociable Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/rare-mark.png" + } + }, + { + "id": "69", + "name": { + "eng": "Rare Mark", + "jpn": "みたことのないあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Recluse", + "jpn": "ひとをしらない", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a reclusive Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/uncommon-mark.png" + } + }, + { + "id": "70", + "name": { + "eng": "Rowdy Mark", + "jpn": "わんぱくなあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Rowdy", + "jpn": "あばれんぼうの", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a rowdy Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/rowdy-mark.png" + } + }, + { + "id": "71", + "name": { + "eng": "Absent-Minded Mark", + "jpn": "のうてんきなあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Spacey", + "jpn": "なにもかんがえてない", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a spacey Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/absent-minded-mark.png" + } + }, + { + "id": "72", + "name": { + "eng": "Jittery Mark", + "jpn": "きんちょうのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Anxious", + "jpn": "ドキドキしてる", + "jpn_ro": null + }, + "description": { + "eng": "A mark for an anxious Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/jittery-mark.png" + } + }, + { + "id": "73", + "name": { + "eng": "Excited Mark", + "jpn": "きたいのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Giddy", + "jpn": "ワクワクしてる", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a giddy Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/excited-mark.png" + } + }, + { + "id": "74", + "name": { + "eng": "Charismatic Mark", + "jpn": "カリスマのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Radiant", + "jpn": "オーラをかんじる", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a radiant Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/charismatic-mark.png" + } + }, + { + "id": "75", + "name": { + "eng": "Calmness Mark", + "jpn": "れいせいのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Serene", + "jpn": "クールな", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a serene Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/calmness-mark.png" + } + }, + { + "id": "76", + "name": { + "eng": "Intense Mark", + "jpn": "じょうねつのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Feisty", + "jpn": "アグレッシブな", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a feisty Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/intense-mark.png" + } + }, + { + "id": "77", + "name": { + "eng": "Zoned-Out Mark", + "jpn": "ゆだんのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Daydreamer", + "jpn": "ボーっとしてる", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a daydreaming Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/zoned-out-mark.png" + } + }, + { + "id": "78", + "name": { + "eng": "Joyful Mark", + "jpn": "たこうのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Joyful", + "jpn": "しあわせそうな", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a joyful Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/joyful-mark.png" + } + }, + { + "id": "79", + "name": { + "eng": "Angry Mark", + "jpn": "ふんぬのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Furious", + "jpn": "プンプンおこる", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a furious Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/angry-mark.png" + } + }, + { + "id": "80", + "name": { + "eng": "Smiley Mark", + "jpn": "びしょうのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Beaming", + "jpn": "ニコニコわらう", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a beaming Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/smiley-mark.png" + } + }, + { + "id": "81", + "name": { + "eng": "Teary Mark", + "jpn": "ひそうのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Teary-Eyed", + "jpn": "メソメソなく", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a teary-eyed Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/teary-mark.png" + } + }, + { + "id": "82", + "name": { + "eng": "Upbeat Mark", + "jpn": "かいちょうのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Chipper", + "jpn": "ごきげんな", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a chipper Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/upbeat-mark.png" + } + }, + { + "id": "83", + "name": { + "eng": "Peeved Mark", + "jpn": "げきはつのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Grumpy", + "jpn": "ふきげんな", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a grumpy Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/peeved-mark.png" + } + }, + { + "id": "84", + "name": { + "eng": "Intellectual Mark", + "jpn": "りせいのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Scholar", + "jpn": "ちてきな", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a scholarly Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/intellectual-mark.png" + } + }, + { + "id": "85", + "name": { + "eng": "Ferocious Mark", + "jpn": "ほんのうのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Rampaging", + "jpn": "あれくるう", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a rampaging Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/ferocious-mark.png" + } + }, + { + "id": "86", + "name": { + "eng": "Crafty Mark", + "jpn": "こうかつのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Opportunist", + "jpn": "スキをねらう", + "jpn_ro": null + }, + "description": { + "eng": "A mark for an opportunistic Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/crafty-mark.png" + } + }, + { + "id": "87", + "name": { + "eng": "Scowling Mark", + "jpn": "こわもてのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Stern", + "jpn": "いかつい", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a stern Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/scowling-mark.png" + } + }, + { + "id": "88", + "name": { + "eng": "Kindly Mark", + "jpn": "やさがたのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Kindhearted", + "jpn": "やさしげな", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a kindhearted Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/kindly-mark.png" + } + }, + { + "id": "89", + "name": { + "eng": "Flustered Mark", + "jpn": "どうようのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Easily Flustered", + "jpn": "あわてんぼうの", + "jpn_ro": null + }, + "description": { + "eng": "A mark for an easily flustered Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/flustered-mark.png" + } + }, + { + "id": "90", + "name": { + "eng": "Pumped-Up Mark", + "jpn": "こうようのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Driven", + "jpn": "やるきまんまんの", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a driven Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/pumped-up-mark.png" + } + }, + { + "id": "91", + "name": { + "eng": "Zero Energy Mark", + "jpn": "けんたいのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Apathetic", + "jpn": "やるきゼロの", + "jpn_ro": null + }, + "description": { + "eng": "A mark for an apathetic Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/zero-energy-mark.png" + } + }, + { + "id": "92", + "name": { + "eng": "Prideful Mark", + "jpn": "じしんのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Arrogant", + "jpn": "ふんぞりかえった", + "jpn_ro": null + }, + "description": { + "eng": "A mark for an arrogant Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/prideful-mark.png" + } + }, + { + "id": "93", + "name": { + "eng": "Unsure Mark", + "jpn": "ふしんのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Reluctant", + "jpn": "じしんのない", + "jpn_ro": null + }, + "description": { + "eng": "A mark for an unsure Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/unsure-mark.png" + } + }, + { + "id": "94", + "name": { + "eng": "Humble Mark", + "jpn": "ぼくとつのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Humble", + "jpn": "そぼくな", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a humble Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/humble-mark.png" + } + }, + { + "id": "95", + "name": { + "eng": "Thorny Mark", + "jpn": "ふじゅんのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Pompous", + "jpn": "きどっている", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a pompous Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/thorny-mark.png" + } + }, + { + "id": "96", + "name": { + "eng": "Vigor Mark", + "jpn": "げんきのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Lively", + "jpn": "げんきいっぱいの", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a lively Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/vigor-mark.png" + } + }, + { + "id": "97", + "name": { + "eng": "Slump Mark", + "jpn": "ふちょうのあかし", + "jpn_ro": null + }, + "origin_gen": 8, + "title": { + "eng": "the Worn-Out", + "jpn": "どこかくたびれた", + "jpn_ro": null + }, + "description": { + "eng": "A mark for a worn-out Pokémon.", + "from_gen": 8 + }, + "files": { + "gen-8": "mark/slump-mark.png" + } + } + ], + "special-attribute": [ + { + "name": { + "eng": "Shiny Leaf", + "jpn": "かがやくはっぱ", + "jpn_ro": "Kagayaku happa" + }, + "origin_gen": 4, + "files": { + "gen-4": ["special-attribute/shiny-leaf.png", "special-attribute/shiny-leaf--shadow.png"] + } + }, + { + "name": { + "eng": "Leaf Crown", + "jpn": "おうかん", + "jpn_ro": "Oukan" + }, + "origin_gen": 4, + "files": { + "gen-4": ["special-attribute/leaf-crown.png", "special-attribute/leaf-crown--shadow.png"] + } + }, + { + "name": { + "eng": "Mega Evolution Sigil", + "jpn": "メガシンカの模様", + "jpn_ro": "Mega shinka no moyou" + }, + "origin_gen": 6, + "files": { + "gen-6": "special-attribute/mega-evolution-sigil-gen6.png", + "gen-7": "special-attribute/mega-evolution-sigil.png" + } + }, + { + "name": { + "eng": "Mega Evolution Sigil (Edit)", + "jpn": "メガシンカの模様（編集）", + "jpn_ro": "Mega shinka no moyou henshuu" + }, + "origin_gen": 6, + "files": { + "gen-8": "special-attribute/mega-evolution-sigil-hires.png" + } + }, + { + "name": { + "eng": "Gigantamax Icon", + "jpn": "キョダイマックスのアイコン", + "jpn_ro": "Gyodaimakkusu no aikon" + }, + "origin_gen": 8, + "files": { + "gen-8": "special-attribute/gigantamax-icon.png" + } + } ] } diff --git a/data/pokemon.json b/data/pokemon.json index 7db25c4b..0cd4a18f 100644 --- a/data/pokemon.json +++ b/data/pokemon.json @@ -89,6 +89,9 @@ }, "mega": { "is_prev_gen_icon": true + }, + "gmax": { + "is_prev_gen_icon": false } } } @@ -287,6 +290,9 @@ }, "mega": { "is_prev_gen_icon": true + }, + "gmax": { + "is_prev_gen_icon": false } } } @@ -791,11 +797,13 @@ "gen-7": { "forms": { "$": { - "has_female": false, + "has_female": true, + "has_unofficial_female_icon": true, "has_right": false }, "alola-cap": { - "has_female": false, + "has_female": true, + "has_unofficial_female_icon": true, "has_right": false }, "belle": { @@ -807,11 +815,13 @@ "has_right": false }, "hoenn-cap": { - "has_female": false, + "has_female": true, + "has_unofficial_female_icon": true, "has_right": false }, "kalos-cap": { - "has_female": false, + "has_female": true, + "has_unofficial_female_icon": true, "has_right": false }, "libre": { @@ -819,11 +829,13 @@ "has_right": false }, "original-cap": { - "has_female": false, + "has_female": true, + "has_unofficial_female_icon": true, "has_right": true }, "partner-cap": { - "has_female": false, + "has_female": true, + "has_unofficial_female_icon": true, "has_right": true }, "phd": { @@ -839,15 +851,23 @@ "has_right": false }, "sinnoh-cap": { - "has_female": false, + "has_female": true, + "has_unofficial_female_icon": true, "has_right": false }, "starter": { - "has_female": false, + "has_female": true, + "has_unofficial_female_icon": true, "has_right": false }, "unova-cap": { - "has_female": false, + "has_female": true, + "has_unofficial_female_icon": true, + "has_right": false + }, + "world-cap": { + "has_female": true, + "has_unofficial_female_icon": true, "has_right": false } } @@ -855,9 +875,13 @@ "gen-8": { "forms": { "$": { + "has_female": true, + "has_unofficial_female_icon": true, "is_prev_gen_icon": true }, "alola-cap": { + "has_female": true, + "has_unofficial_female_icon": true, "is_prev_gen_icon": true }, "belle": { @@ -870,18 +894,26 @@ "is_prev_gen_icon": false }, "hoenn-cap": { + "has_female": true, + "has_unofficial_female_icon": true, "is_prev_gen_icon": true }, "kalos-cap": { + "has_female": true, + "has_unofficial_female_icon": true, "is_prev_gen_icon": true }, "libre": { "is_prev_gen_icon": true }, "original-cap": { + "has_female": true, + "has_unofficial_female_icon": true, "is_prev_gen_icon": true }, "partner-cap": { + "has_female": true, + "has_unofficial_female_icon": true, "is_prev_gen_icon": true }, "phd": { @@ -894,13 +926,24 @@ "is_prev_gen_icon": true }, "sinnoh-cap": { + "has_female": true, + "has_unofficial_female_icon": true, "is_prev_gen_icon": true }, "starter": { + "has_female": true, + "has_unofficial_female_icon": true, "is_prev_gen_icon": true }, "unova-cap": { + "has_female": true, + "has_unofficial_female_icon": true, "is_prev_gen_icon": true + }, + "world-cap": { + "has_female": true, + "has_unofficial_female_icon": true, + "is_prev_gen_icon": false } } } @@ -1005,7 +1048,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false }, "alola": { "is_prev_gen_icon": true @@ -1370,7 +1413,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -2616,6 +2659,9 @@ }, "mega": { "is_prev_gen_icon": true + }, + "galar": { + "is_prev_gen_icon": false } } } @@ -2673,7 +2719,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -3391,18 +3437,18 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false }, "alola": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false }, "totem": { "is_alias_of": "alola", - "is_prev_gen_icon": true + "is_prev_gen_icon": false }, "totem-alola": { "is_alias_of": "alola", - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -3876,7 +3922,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -5773,7 +5819,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -5831,7 +5877,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -6208,7 +6254,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -6609,7 +6655,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -6794,7 +6840,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false }, "mega": { "is_prev_gen_icon": true @@ -6859,7 +6905,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false }, "mega": { "is_prev_gen_icon": true @@ -7242,7 +7288,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -7336,7 +7382,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -7423,7 +7469,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -7655,7 +7701,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -7684,7 +7730,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -9262,7 +9308,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -9997,7 +10043,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false }, "mega": { "is_prev_gen_icon": true @@ -12647,7 +12693,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -13439,7 +13485,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false }, "mega": { "is_prev_gen_icon": true @@ -14451,7 +14497,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -14480,7 +14526,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -14538,7 +14584,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -14799,7 +14845,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -15996,7 +16042,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -17077,7 +17123,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -17193,7 +17239,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -17325,7 +17371,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -17878,7 +17924,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -18402,7 +18448,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -18518,7 +18564,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -19364,7 +19410,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -19393,7 +19439,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -19538,7 +19584,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -19857,7 +19903,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -20756,7 +20802,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -22278,7 +22324,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -22336,7 +22382,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -22597,7 +22643,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -22742,7 +22788,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -24048,17 +24094,17 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false }, "dusk": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false }, "midday": { "is_alias_of": "$", - "is_prev_gen_icon": true + "is_prev_gen_icon": false }, "midnight": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -24349,7 +24395,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false }, "totem": { "is_alias_of": "$", @@ -24652,7 +24698,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -24826,7 +24872,7 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -26162,10 +26208,10 @@ "gen-8": { "forms": { "$": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false }, "original": { - "is_prev_gen_icon": true + "is_prev_gen_icon": false } } } @@ -26477,6 +26523,9 @@ "forms": { "$": { "is_prev_gen_icon": false + }, + "gmax": { + "is_prev_gen_icon": false } } } @@ -26543,6 +26592,9 @@ "forms": { "$": { "is_prev_gen_icon": false + }, + "gmax": { + "is_prev_gen_icon": false } } } @@ -26609,6 +26661,9 @@ "forms": { "$": { "is_prev_gen_icon": false + }, + "gmax": { + "is_prev_gen_icon": false } } } @@ -28564,5 +28619,84 @@ } } } + }, + "891": { + "idx": "891", + "name": { + "eng": "Kubfu", + "chs": "熊徒弟", + "jpn": "ダクマ", + "jpn_ro": "Dakuma" + }, + "slug": { + "eng": "kubfu", + "jpn": "dakuma", + "jpn_ro": "dakuma" + }, + "gen-7": {}, + "gen-8": { + "forms": { + "$": { + "is_prev_gen_icon": false + } + } + } + }, + "892": { + "idx": "892", + "name": { + "eng": "Urshifu", + "chs": "武道熊師", + "jpn": "ウーラオス", + "jpn_ro": "Wulaosu" + }, + "slug": { + "eng": "urshifu", + "jpn": "wulaosu", + "jpn_ro": "wulaosu" + }, + "gen-7": {}, + "gen-8": { + "forms": { + "$": { + "is_prev_gen_icon": false + }, + "gmax": { + "is_prev_gen_icon": false + }, + "rapid-strike-gmax": { + "is_prev_gen_icon": false + }, + "single-strike-gmax": { + "is_prev_gen_icon": false, + "is_alias_of": "gmax" + } + } + } + }, + "893": { + "idx": "893", + "name": { + "eng": "Zarude", + "chs": "薩戮德", + "jpn": "ザルード", + "jpn_ro": "Zarude" + }, + "slug": { + "eng": "zarude", + "jpn": "zarude", + "jpn_ro": "zarude" + }, + "gen-7": {}, + "gen-8": { + "forms": { + "$": { + "is_prev_gen_icon": false + }, + "dada": { + "is_prev_gen_icon": false + } + } + } } } diff --git a/docs/notes/gen7-modifications.md b/docs/notes/modifications.md similarity index 83% rename from docs/notes/gen7-modifications.md rename to docs/notes/modifications.md index a81529a7..55ad1cb4 100644 --- a/docs/notes/gen7-modifications.md +++ b/docs/notes/modifications.md @@ -30,8 +30,7 @@ Note: when converting, make sure to prevent ImageMagick from adding a `gAMA` blo Replacing a color can be done with the following ImageMagick command (e.g. `#202020` → `#000000` in this example): ```sh -# where $i is a file -magick convert -fill "#000000" -define png:exclude-chunk=gAMA -opaque "#202020" $i -depth 32 PNG32:$i +magick convert -fill "#000000" -opaque "#202020" -define png:exclude-chunk=gAMA $i -depth 32 PNG32:$i ``` ### LPLE minor updates @@ -44,3 +43,11 @@ The following minor updates were part of LPLE: * Wartortle icon: properly closed the outline on its head These updates have been backported to the 40×30 icons. + +## Gen 8 modifications + +The Gen 8 sprites seem to come in 2× upscaled format now, 136×112 instead of 68×56. For downscaling them: + +```sh +magick convert -interpolate Nearest -filter point -resize 50% -define png:exclude-chunk=gAMA $i -depth 32 PNG32:$i +``` \ No newline at end of file diff --git a/docs/notes/ribbon-notes.md b/docs/notes/ribbon-notes.md index 33a78931..1c005f4b 100644 --- a/docs/notes/ribbon-notes.md +++ b/docs/notes/ribbon-notes.md @@ -1,8 +1,11 @@ -## Ribbon notes +## Notes on Ribbons and Marks -Ribbon descriptions have been taken from [Bulbapedia's *List of Ribbons in the games* page](https://bulbapedia.bulbagarden.net/wiki/List_of_Ribbons_in_the_games). They were requested in [issue #8](https://github.com/msikma/pokesprite/issues/8) and merged with [PR #59](https://github.com/msikma/pokesprite/pull/59). +The data for Ribbons and Marks has been taken from Bulbapedia: -Each item in the [`misc.json`](https://github.com/msikma/pokesprite/blob/master/data/misc.json) data file has the following structure: +* the [*List of Ribbons in the games*](https://bulbapedia.bulbagarden.net/wiki/List_of_Ribbons_in_the_games) page for Ribbons, +* the [*Mark*](https://bulbapedia.bulbagarden.net/wiki/Mark) page for Marks. + +Items in the [`misc.json`](https://github.com/msikma/pokesprite/blob/master/data/misc.json) data file have roughly the following structure (varying depending on the item type): ```js { @@ -20,17 +23,17 @@ Each item in the [`misc.json`](https://github.com/msikma/pokesprite/blob/master/ "gen-6": "ribbon/training-ribbon.png", "gen-8": "ribbon/gen8/training-ribbon.png" } -}, +} ``` -A brief description of what each item is: +A description of each item: | Key | Meaning | |:----|:--------| | `name` | Official names in various languages | -| `origin_gen` | The generation in which this ribbon was originally introduced | -| `description` | A description of the ribbon from a specific generation | -| `files` | Object containing paths to the sprites from various generations | +| `origin_gen` | The generation in which this item was originally introduced | +| `description` | A description of the item from a specific generation (absent in some items) | +| `files` | Object containing paths to the sprites from various generations; either a string, or an array of strings | Note that `files` may have multiple entries, such as the *Training Ribbon* which has an image for Gen 6 and Gen 8. diff --git a/docs/resources/pokesprite-docs.css b/docs/resources/pokesprite-docs.css index 38544838..85fa1033 100644 --- a/docs/resources/pokesprite-docs.css +++ b/docs/resources/pokesprite-docs.css @@ -56,8 +56,15 @@ .markdown-body .pokesprite tbody:not(.alternating) tr td[rowspan] { background: var(--shade-0); } -.markdown-body .pokesprite tbody tr td.group { +.markdown-body .pokesprite tbody tr th.group { font-weight: 500; + text-align: left; +} +.markdown-body .pokesprite tbody tr th.group:hover { + background: var(--shade-0); +} +.markdown-body .pokesprite tbody:not(:nth-child(3)) tr th.group { + padding-top: 25px; } .markdown-body .pokesprite tbody tr td.item-id { padding-bottom: 0; @@ -66,6 +73,9 @@ display: inline-block; padding-top: 1px; } +.markdown-body .pokesprite tbody tr td.last-item { + border-right-width: 0; +} .markdown-body .pokesprite tbody tr.variable-height td { vertical-align: middle; } diff --git a/items-outline/battle-item/max-mushrooms.png b/items-outline/battle-item/max-mushrooms.png new file mode 100644 index 00000000..fbd223e1 Binary files /dev/null and b/items-outline/battle-item/max-mushrooms.png differ diff --git a/items-outline/evo-item/galarica-cuff.png b/items-outline/evo-item/galarica-cuff.png new file mode 100644 index 00000000..cb64ba0f Binary files /dev/null and b/items-outline/evo-item/galarica-cuff.png differ diff --git a/items-outline/key-item/armor-pass.png b/items-outline/key-item/armor-pass.png new file mode 100644 index 00000000..66b9a369 Binary files /dev/null and b/items-outline/key-item/armor-pass.png differ diff --git a/items-outline/key-item/exp-charm.png b/items-outline/key-item/exp-charm.png new file mode 100644 index 00000000..283d9e19 Binary files /dev/null and b/items-outline/key-item/exp-charm.png differ diff --git a/items-outline/key-item/mark-charm.png b/items-outline/key-item/mark-charm.png new file mode 100644 index 00000000..71d68306 Binary files /dev/null and b/items-outline/key-item/mark-charm.png differ diff --git a/items-outline/key-item/rotom-bike-3.png b/items-outline/key-item/rotom-bike-3.png new file mode 100644 index 00000000..84cc988f Binary files /dev/null and b/items-outline/key-item/rotom-bike-3.png differ diff --git a/items-outline/key-item/rotom-bike-4.png b/items-outline/key-item/rotom-bike-4.png new file mode 100644 index 00000000..f38ac66e Binary files /dev/null and b/items-outline/key-item/rotom-bike-4.png differ diff --git a/items-outline/key-item/style-card.png b/items-outline/key-item/style-card.png new file mode 100644 index 00000000..8be3574c Binary files /dev/null and b/items-outline/key-item/style-card.png differ diff --git a/items-outline/medicine/max-honey.png b/items-outline/medicine/max-honey.png new file mode 100644 index 00000000..d054f188 Binary files /dev/null and b/items-outline/medicine/max-honey.png differ diff --git a/items-outline/other-item/armorite-ore.png b/items-outline/other-item/armorite-ore.png new file mode 100644 index 00000000..5f76534e Binary files /dev/null and b/items-outline/other-item/armorite-ore.png differ diff --git a/items-outline/other-item/galarica-twig.png b/items-outline/other-item/galarica-twig.png new file mode 100644 index 00000000..bccefb3b Binary files /dev/null and b/items-outline/other-item/galarica-twig.png differ diff --git a/items/battle-item/max-mushrooms.png b/items/battle-item/max-mushrooms.png new file mode 100644 index 00000000..98a72181 Binary files /dev/null and b/items/battle-item/max-mushrooms.png differ diff --git a/items/evo-item/galarica-cuff.png b/items/evo-item/galarica-cuff.png new file mode 100644 index 00000000..113cc72a Binary files /dev/null and b/items/evo-item/galarica-cuff.png differ diff --git a/items/key-item/armor-pass.png b/items/key-item/armor-pass.png new file mode 100644 index 00000000..c614bda9 Binary files /dev/null and b/items/key-item/armor-pass.png differ diff --git a/items/key-item/exp-charm.png b/items/key-item/exp-charm.png new file mode 100644 index 00000000..b42da733 Binary files /dev/null and b/items/key-item/exp-charm.png differ diff --git a/items/key-item/mark-charm.png b/items/key-item/mark-charm.png new file mode 100644 index 00000000..2a9bb01c Binary files /dev/null and b/items/key-item/mark-charm.png differ diff --git a/items/key-item/rotom-bike-3.png b/items/key-item/rotom-bike-3.png new file mode 100644 index 00000000..81c86886 Binary files /dev/null and b/items/key-item/rotom-bike-3.png differ diff --git a/items/key-item/rotom-bike-4.png b/items/key-item/rotom-bike-4.png new file mode 100644 index 00000000..da648df0 Binary files /dev/null and b/items/key-item/rotom-bike-4.png differ diff --git a/items/key-item/style-card.png b/items/key-item/style-card.png new file mode 100644 index 00000000..5c658031 Binary files /dev/null and b/items/key-item/style-card.png differ diff --git a/items/medicine/max-honey.png b/items/medicine/max-honey.png new file mode 100644 index 00000000..3373c8b5 Binary files /dev/null and b/items/medicine/max-honey.png differ diff --git a/items/other-item/armorite-ore.png b/items/other-item/armorite-ore.png new file mode 100644 index 00000000..ceceaf69 Binary files /dev/null and b/items/other-item/armorite-ore.png differ diff --git a/items/other-item/galarica-twig.png b/items/other-item/galarica-twig.png new file mode 100644 index 00000000..314e5654 Binary files /dev/null and b/items/other-item/galarica-twig.png differ diff --git a/misc/mark/absent-minded-mark.png b/misc/mark/absent-minded-mark.png new file mode 100644 index 00000000..d96f2a30 Binary files /dev/null and b/misc/mark/absent-minded-mark.png differ diff --git a/misc/mark/angry-mark.png b/misc/mark/angry-mark.png new file mode 100644 index 00000000..081372a7 Binary files /dev/null and b/misc/mark/angry-mark.png differ diff --git a/misc/mark/blizzard-mark.png b/misc/mark/blizzard-mark.png new file mode 100644 index 00000000..1ee3db9f Binary files /dev/null and b/misc/mark/blizzard-mark.png differ diff --git a/misc/mark/calmness-mark.png b/misc/mark/calmness-mark.png new file mode 100644 index 00000000..39543805 Binary files /dev/null and b/misc/mark/calmness-mark.png differ diff --git a/misc/mark/charismatic-mark.png b/misc/mark/charismatic-mark.png new file mode 100644 index 00000000..397ab504 Binary files /dev/null and b/misc/mark/charismatic-mark.png differ diff --git a/misc/mark/cloudy-mark.png b/misc/mark/cloudy-mark.png new file mode 100644 index 00000000..bc6c9139 Binary files /dev/null and b/misc/mark/cloudy-mark.png differ diff --git a/misc/mark/crafty-mark.png b/misc/mark/crafty-mark.png new file mode 100644 index 00000000..afb04863 Binary files /dev/null and b/misc/mark/crafty-mark.png differ diff --git a/misc/mark/curry-mark.png b/misc/mark/curry-mark.png new file mode 100644 index 00000000..f3333a70 Binary files /dev/null and b/misc/mark/curry-mark.png differ diff --git a/misc/mark/dawn-mark.png b/misc/mark/dawn-mark.png new file mode 100644 index 00000000..145b9f6a Binary files /dev/null and b/misc/mark/dawn-mark.png differ diff --git a/misc/mark/destiny-mark.png b/misc/mark/destiny-mark.png new file mode 100644 index 00000000..c17a709f Binary files /dev/null and b/misc/mark/destiny-mark.png differ diff --git a/misc/mark/dry-mark.png b/misc/mark/dry-mark.png new file mode 100644 index 00000000..c0b8a88f Binary files /dev/null and b/misc/mark/dry-mark.png differ diff --git a/misc/mark/dusk-mark.png b/misc/mark/dusk-mark.png new file mode 100644 index 00000000..25ae8e0b Binary files /dev/null and b/misc/mark/dusk-mark.png differ diff --git a/misc/mark/excited-mark.png b/misc/mark/excited-mark.png new file mode 100644 index 00000000..5c4b53b9 Binary files /dev/null and b/misc/mark/excited-mark.png differ diff --git a/misc/mark/ferocious-mark.png b/misc/mark/ferocious-mark.png new file mode 100644 index 00000000..c2c99e84 Binary files /dev/null and b/misc/mark/ferocious-mark.png differ diff --git a/misc/mark/fishing-mark.png b/misc/mark/fishing-mark.png new file mode 100644 index 00000000..f4ecd267 Binary files /dev/null and b/misc/mark/fishing-mark.png differ diff --git a/misc/mark/flustered-mark.png b/misc/mark/flustered-mark.png new file mode 100644 index 00000000..6d994c3a Binary files /dev/null and b/misc/mark/flustered-mark.png differ diff --git a/misc/mark/humble-mark.png b/misc/mark/humble-mark.png new file mode 100644 index 00000000..df08d208 Binary files /dev/null and b/misc/mark/humble-mark.png differ diff --git a/misc/mark/intellectual-mark.png b/misc/mark/intellectual-mark.png new file mode 100644 index 00000000..bb7875d5 Binary files /dev/null and b/misc/mark/intellectual-mark.png differ diff --git a/misc/mark/intense-mark.png b/misc/mark/intense-mark.png new file mode 100644 index 00000000..32c469be Binary files /dev/null and b/misc/mark/intense-mark.png differ diff --git a/misc/mark/jittery-mark.png b/misc/mark/jittery-mark.png new file mode 100644 index 00000000..5bb37262 Binary files /dev/null and b/misc/mark/jittery-mark.png differ diff --git a/misc/mark/joyful-mark.png b/misc/mark/joyful-mark.png new file mode 100644 index 00000000..b999bcae Binary files /dev/null and b/misc/mark/joyful-mark.png differ diff --git a/misc/mark/kindly-mark.png b/misc/mark/kindly-mark.png new file mode 100644 index 00000000..3ddcae44 Binary files /dev/null and b/misc/mark/kindly-mark.png differ diff --git a/misc/mark/lunchtime-mark.png b/misc/mark/lunchtime-mark.png new file mode 100644 index 00000000..d7de2808 Binary files /dev/null and b/misc/mark/lunchtime-mark.png differ diff --git a/misc/mark/misty-mark.png b/misc/mark/misty-mark.png new file mode 100644 index 00000000..f1cd51ca Binary files /dev/null and b/misc/mark/misty-mark.png differ diff --git a/misc/mark/peeved-mark.png b/misc/mark/peeved-mark.png new file mode 100644 index 00000000..94b4975c Binary files /dev/null and b/misc/mark/peeved-mark.png differ diff --git a/misc/mark/prideful-mark.png b/misc/mark/prideful-mark.png new file mode 100644 index 00000000..f089dff3 Binary files /dev/null and b/misc/mark/prideful-mark.png differ diff --git a/misc/mark/pumped-up-mark.png b/misc/mark/pumped-up-mark.png new file mode 100644 index 00000000..5781d87c Binary files /dev/null and b/misc/mark/pumped-up-mark.png differ diff --git a/misc/mark/rainy-mark.png b/misc/mark/rainy-mark.png new file mode 100644 index 00000000..68fc87e2 Binary files /dev/null and b/misc/mark/rainy-mark.png differ diff --git a/misc/mark/rare-mark.png b/misc/mark/rare-mark.png new file mode 100644 index 00000000..8cd24c9d Binary files /dev/null and b/misc/mark/rare-mark.png differ diff --git a/misc/mark/rowdy-mark.png b/misc/mark/rowdy-mark.png new file mode 100644 index 00000000..42e59f31 Binary files /dev/null and b/misc/mark/rowdy-mark.png differ diff --git a/misc/mark/sandstorm-mark.png b/misc/mark/sandstorm-mark.png new file mode 100644 index 00000000..589aa57a Binary files /dev/null and b/misc/mark/sandstorm-mark.png differ diff --git a/misc/mark/scowling-mark.png b/misc/mark/scowling-mark.png new file mode 100644 index 00000000..f883763b Binary files /dev/null and b/misc/mark/scowling-mark.png differ diff --git a/misc/mark/sleepy-time-mark.png b/misc/mark/sleepy-time-mark.png new file mode 100644 index 00000000..66334463 Binary files /dev/null and b/misc/mark/sleepy-time-mark.png differ diff --git a/misc/mark/slump-mark.png b/misc/mark/slump-mark.png new file mode 100644 index 00000000..f69afad5 Binary files /dev/null and b/misc/mark/slump-mark.png differ diff --git a/misc/mark/smiley-mark.png b/misc/mark/smiley-mark.png new file mode 100644 index 00000000..1e82b31c Binary files /dev/null and b/misc/mark/smiley-mark.png differ diff --git a/misc/mark/snowy-mark.png b/misc/mark/snowy-mark.png new file mode 100644 index 00000000..caf3a145 Binary files /dev/null and b/misc/mark/snowy-mark.png differ diff --git a/misc/mark/stormy-mark.png b/misc/mark/stormy-mark.png new file mode 100644 index 00000000..603c006d Binary files /dev/null and b/misc/mark/stormy-mark.png differ diff --git a/misc/mark/teary-mark.png b/misc/mark/teary-mark.png new file mode 100644 index 00000000..c579d47a Binary files /dev/null and b/misc/mark/teary-mark.png differ diff --git a/misc/mark/thorny-mark.png b/misc/mark/thorny-mark.png new file mode 100644 index 00000000..302acee3 Binary files /dev/null and b/misc/mark/thorny-mark.png differ diff --git a/misc/mark/uncommon-mark.png b/misc/mark/uncommon-mark.png new file mode 100644 index 00000000..c4fe4332 Binary files /dev/null and b/misc/mark/uncommon-mark.png differ diff --git a/misc/mark/unsure-mark.png b/misc/mark/unsure-mark.png new file mode 100644 index 00000000..2656ecb5 Binary files /dev/null and b/misc/mark/unsure-mark.png differ diff --git a/misc/mark/upbeat-mark.png b/misc/mark/upbeat-mark.png new file mode 100644 index 00000000..0f6858c4 Binary files /dev/null and b/misc/mark/upbeat-mark.png differ diff --git a/misc/mark/vigor-mark.png b/misc/mark/vigor-mark.png new file mode 100644 index 00000000..2bc44e67 Binary files /dev/null and b/misc/mark/vigor-mark.png differ diff --git a/misc/mark/zero-energy-mark.png b/misc/mark/zero-energy-mark.png new file mode 100644 index 00000000..cf5a7389 Binary files /dev/null and b/misc/mark/zero-energy-mark.png differ diff --git a/misc/mark/zoned-out-mark.png b/misc/mark/zoned-out-mark.png new file mode 100644 index 00000000..d9acaabb Binary files /dev/null and b/misc/mark/zoned-out-mark.png differ diff --git a/misc/special-attribute/gigantamax-icon.png b/misc/special-attribute/gigantamax-icon.png new file mode 100644 index 00000000..61b862df Binary files /dev/null and b/misc/special-attribute/gigantamax-icon.png differ diff --git a/misc/special-attribute/leaf-crown--shadow.png b/misc/special-attribute/leaf-crown--shadow.png new file mode 100644 index 00000000..693ae25d Binary files /dev/null and b/misc/special-attribute/leaf-crown--shadow.png differ diff --git a/misc/special-attribute/leaf-crown.png b/misc/special-attribute/leaf-crown.png new file mode 100644 index 00000000..3cacf0c3 Binary files /dev/null and b/misc/special-attribute/leaf-crown.png differ diff --git a/misc/special-attribute/mega-evolution-sigil-gen6.png b/misc/special-attribute/mega-evolution-sigil-gen6.png new file mode 100644 index 00000000..12192e39 Binary files /dev/null and b/misc/special-attribute/mega-evolution-sigil-gen6.png differ diff --git a/misc/special-attribute/mega-evolution-sigil-hires.png b/misc/special-attribute/mega-evolution-sigil-hires.png new file mode 100644 index 00000000..1482ed01 Binary files /dev/null and b/misc/special-attribute/mega-evolution-sigil-hires.png differ diff --git a/misc/special-attribute/mega-evolution-sigil.png b/misc/special-attribute/mega-evolution-sigil.png new file mode 100644 index 00000000..35d7f68d Binary files /dev/null and b/misc/special-attribute/mega-evolution-sigil.png differ diff --git a/misc/special-attribute/shiny-leaf--shadow.png b/misc/special-attribute/shiny-leaf--shadow.png new file mode 100644 index 00000000..da47c438 Binary files /dev/null and b/misc/special-attribute/shiny-leaf--shadow.png differ diff --git a/misc/special-attribute/shiny-leaf.png b/misc/special-attribute/shiny-leaf.png new file mode 100644 index 00000000..b12f18c1 Binary files /dev/null and b/misc/special-attribute/shiny-leaf.png differ diff --git a/pokemon-gen7x/regular/female/pikachu-alola-cap.png b/pokemon-gen7x/regular/female/pikachu-alola-cap.png new file mode 100644 index 00000000..2854641b Binary files /dev/null and b/pokemon-gen7x/regular/female/pikachu-alola-cap.png differ diff --git a/pokemon-gen7x/regular/female/pikachu-hoenn-cap.png b/pokemon-gen7x/regular/female/pikachu-hoenn-cap.png new file mode 100644 index 00000000..3a94540d Binary files /dev/null and b/pokemon-gen7x/regular/female/pikachu-hoenn-cap.png differ diff --git a/pokemon-gen7x/regular/female/pikachu-kalos-cap.png b/pokemon-gen7x/regular/female/pikachu-kalos-cap.png new file mode 100644 index 00000000..660724f1 Binary files /dev/null and b/pokemon-gen7x/regular/female/pikachu-kalos-cap.png differ diff --git a/pokemon-gen7x/regular/female/pikachu-original-cap.png b/pokemon-gen7x/regular/female/pikachu-original-cap.png new file mode 100644 index 00000000..af4c025d Binary files /dev/null and b/pokemon-gen7x/regular/female/pikachu-original-cap.png differ diff --git a/pokemon-gen7x/regular/female/pikachu-partner-cap.png b/pokemon-gen7x/regular/female/pikachu-partner-cap.png new file mode 100644 index 00000000..58021bc2 Binary files /dev/null and b/pokemon-gen7x/regular/female/pikachu-partner-cap.png differ diff --git a/pokemon-gen7x/regular/female/pikachu-sinnoh-cap.png b/pokemon-gen7x/regular/female/pikachu-sinnoh-cap.png new file mode 100644 index 00000000..ee9a5880 Binary files /dev/null and b/pokemon-gen7x/regular/female/pikachu-sinnoh-cap.png differ diff --git a/pokemon-gen7x/regular/female/pikachu-starter.png b/pokemon-gen7x/regular/female/pikachu-starter.png new file mode 100644 index 00000000..30c43295 Binary files /dev/null and b/pokemon-gen7x/regular/female/pikachu-starter.png differ diff --git a/pokemon-gen7x/regular/female/pikachu-unova-cap.png b/pokemon-gen7x/regular/female/pikachu-unova-cap.png new file mode 100644 index 00000000..66bcdf5c Binary files /dev/null and b/pokemon-gen7x/regular/female/pikachu-unova-cap.png differ diff --git a/pokemon-gen7x/regular/female/pikachu-world-cap.png b/pokemon-gen7x/regular/female/pikachu-world-cap.png new file mode 100644 index 00000000..4f5471f2 Binary files /dev/null and b/pokemon-gen7x/regular/female/pikachu-world-cap.png differ diff --git a/pokemon-gen7x/regular/female/pikachu.png b/pokemon-gen7x/regular/female/pikachu.png new file mode 100644 index 00000000..f7838c8d Binary files /dev/null and b/pokemon-gen7x/regular/female/pikachu.png differ diff --git a/pokemon-gen7x/regular/pikachu-alola-cap.png b/pokemon-gen7x/regular/pikachu-alola-cap.png index 340a86ce..9b31e600 100644 Binary files a/pokemon-gen7x/regular/pikachu-alola-cap.png and b/pokemon-gen7x/regular/pikachu-alola-cap.png differ diff --git a/pokemon-gen7x/regular/pikachu-belle.png b/pokemon-gen7x/regular/pikachu-belle.png index b626770c..5a56b73d 100644 Binary files a/pokemon-gen7x/regular/pikachu-belle.png and b/pokemon-gen7x/regular/pikachu-belle.png differ diff --git a/pokemon-gen7x/regular/pikachu-cosplay.png b/pokemon-gen7x/regular/pikachu-cosplay.png index 52737454..ad063d29 100644 Binary files a/pokemon-gen7x/regular/pikachu-cosplay.png and b/pokemon-gen7x/regular/pikachu-cosplay.png differ diff --git a/pokemon-gen7x/regular/pikachu-hoenn-cap.png b/pokemon-gen7x/regular/pikachu-hoenn-cap.png index b150af63..bd357517 100644 Binary files a/pokemon-gen7x/regular/pikachu-hoenn-cap.png and b/pokemon-gen7x/regular/pikachu-hoenn-cap.png differ diff --git a/pokemon-gen7x/regular/pikachu-kalos-cap.png b/pokemon-gen7x/regular/pikachu-kalos-cap.png index cbe5ab9f..4d93ec9a 100644 Binary files a/pokemon-gen7x/regular/pikachu-kalos-cap.png and b/pokemon-gen7x/regular/pikachu-kalos-cap.png differ diff --git a/pokemon-gen7x/regular/pikachu-libre.png b/pokemon-gen7x/regular/pikachu-libre.png index e1f41396..ef4445d5 100644 Binary files a/pokemon-gen7x/regular/pikachu-libre.png and b/pokemon-gen7x/regular/pikachu-libre.png differ diff --git a/pokemon-gen7x/regular/pikachu-original-cap.png b/pokemon-gen7x/regular/pikachu-original-cap.png index 9b5ba3f5..8cf6ce3f 100644 Binary files a/pokemon-gen7x/regular/pikachu-original-cap.png and b/pokemon-gen7x/regular/pikachu-original-cap.png differ diff --git a/pokemon-gen7x/regular/pikachu-partner-cap.png b/pokemon-gen7x/regular/pikachu-partner-cap.png index b05751ae..7745afb5 100644 Binary files a/pokemon-gen7x/regular/pikachu-partner-cap.png and b/pokemon-gen7x/regular/pikachu-partner-cap.png differ diff --git a/pokemon-gen7x/regular/pikachu-phd.png b/pokemon-gen7x/regular/pikachu-phd.png index b1a7f6c7..ff5609d6 100644 Binary files a/pokemon-gen7x/regular/pikachu-phd.png and b/pokemon-gen7x/regular/pikachu-phd.png differ diff --git a/pokemon-gen7x/regular/pikachu-pop-star.png b/pokemon-gen7x/regular/pikachu-pop-star.png index d95a0e44..6bb235d2 100644 Binary files a/pokemon-gen7x/regular/pikachu-pop-star.png and b/pokemon-gen7x/regular/pikachu-pop-star.png differ diff --git a/pokemon-gen7x/regular/pikachu-rock-star.png b/pokemon-gen7x/regular/pikachu-rock-star.png index 362240ea..0b8f9195 100644 Binary files a/pokemon-gen7x/regular/pikachu-rock-star.png and b/pokemon-gen7x/regular/pikachu-rock-star.png differ diff --git a/pokemon-gen7x/regular/pikachu-sinnoh-cap.png b/pokemon-gen7x/regular/pikachu-sinnoh-cap.png index 60e1514b..c8c18ed1 100644 Binary files a/pokemon-gen7x/regular/pikachu-sinnoh-cap.png and b/pokemon-gen7x/regular/pikachu-sinnoh-cap.png differ diff --git a/pokemon-gen7x/regular/pikachu-starter.png b/pokemon-gen7x/regular/pikachu-starter.png index 1ad4e3bb..413b5119 100644 Binary files a/pokemon-gen7x/regular/pikachu-starter.png and b/pokemon-gen7x/regular/pikachu-starter.png differ diff --git a/pokemon-gen7x/regular/pikachu-unova-cap.png b/pokemon-gen7x/regular/pikachu-unova-cap.png index 20e4520b..dd10b5b0 100644 Binary files a/pokemon-gen7x/regular/pikachu-unova-cap.png and b/pokemon-gen7x/regular/pikachu-unova-cap.png differ diff --git a/pokemon-gen7x/regular/pikachu-world-cap.png b/pokemon-gen7x/regular/pikachu-world-cap.png new file mode 100644 index 00000000..691fd9cc Binary files /dev/null and b/pokemon-gen7x/regular/pikachu-world-cap.png differ diff --git a/pokemon-gen7x/regular/pikachu.png b/pokemon-gen7x/regular/pikachu.png index 04a713f6..4021a402 100644 Binary files a/pokemon-gen7x/regular/pikachu.png and b/pokemon-gen7x/regular/pikachu.png differ diff --git a/pokemon-gen7x/shiny/female/pikachu-alola-cap.png b/pokemon-gen7x/shiny/female/pikachu-alola-cap.png new file mode 100644 index 00000000..626f1734 Binary files /dev/null and b/pokemon-gen7x/shiny/female/pikachu-alola-cap.png differ diff --git a/pokemon-gen7x/shiny/female/pikachu-hoenn-cap.png b/pokemon-gen7x/shiny/female/pikachu-hoenn-cap.png new file mode 100644 index 00000000..fba80828 Binary files /dev/null and b/pokemon-gen7x/shiny/female/pikachu-hoenn-cap.png differ diff --git a/pokemon-gen7x/shiny/female/pikachu-kalos-cap.png b/pokemon-gen7x/shiny/female/pikachu-kalos-cap.png new file mode 100644 index 00000000..aef98f28 Binary files /dev/null and b/pokemon-gen7x/shiny/female/pikachu-kalos-cap.png differ diff --git a/pokemon-gen7x/shiny/female/pikachu-original-cap.png b/pokemon-gen7x/shiny/female/pikachu-original-cap.png new file mode 100644 index 00000000..c1571923 Binary files /dev/null and b/pokemon-gen7x/shiny/female/pikachu-original-cap.png differ diff --git a/pokemon-gen7x/shiny/female/pikachu-partner-cap.png b/pokemon-gen7x/shiny/female/pikachu-partner-cap.png new file mode 100644 index 00000000..a15a330b Binary files /dev/null and b/pokemon-gen7x/shiny/female/pikachu-partner-cap.png differ diff --git a/pokemon-gen7x/shiny/female/pikachu-sinnoh-cap.png b/pokemon-gen7x/shiny/female/pikachu-sinnoh-cap.png new file mode 100644 index 00000000..3d89d8d7 Binary files /dev/null and b/pokemon-gen7x/shiny/female/pikachu-sinnoh-cap.png differ diff --git a/pokemon-gen7x/shiny/female/pikachu-starter.png b/pokemon-gen7x/shiny/female/pikachu-starter.png new file mode 100644 index 00000000..2b5a76ec Binary files /dev/null and b/pokemon-gen7x/shiny/female/pikachu-starter.png differ diff --git a/pokemon-gen7x/shiny/female/pikachu-unova-cap.png b/pokemon-gen7x/shiny/female/pikachu-unova-cap.png new file mode 100644 index 00000000..62827742 Binary files /dev/null and b/pokemon-gen7x/shiny/female/pikachu-unova-cap.png differ diff --git a/pokemon-gen7x/shiny/female/pikachu-world-cap.png b/pokemon-gen7x/shiny/female/pikachu-world-cap.png new file mode 100644 index 00000000..466caa06 Binary files /dev/null and b/pokemon-gen7x/shiny/female/pikachu-world-cap.png differ diff --git a/pokemon-gen7x/shiny/female/pikachu.png b/pokemon-gen7x/shiny/female/pikachu.png new file mode 100644 index 00000000..3f024788 Binary files /dev/null and b/pokemon-gen7x/shiny/female/pikachu.png differ diff --git a/pokemon-gen7x/shiny/pikachu-alola-cap.png b/pokemon-gen7x/shiny/pikachu-alola-cap.png index dc71d526..392f096e 100644 Binary files a/pokemon-gen7x/shiny/pikachu-alola-cap.png and b/pokemon-gen7x/shiny/pikachu-alola-cap.png differ diff --git a/pokemon-gen7x/shiny/pikachu-belle.png b/pokemon-gen7x/shiny/pikachu-belle.png index 4d0449dd..a6bd2bb5 100644 Binary files a/pokemon-gen7x/shiny/pikachu-belle.png and b/pokemon-gen7x/shiny/pikachu-belle.png differ diff --git a/pokemon-gen7x/shiny/pikachu-cosplay.png b/pokemon-gen7x/shiny/pikachu-cosplay.png index fe0eb344..1e09f5a7 100644 Binary files a/pokemon-gen7x/shiny/pikachu-cosplay.png and b/pokemon-gen7x/shiny/pikachu-cosplay.png differ diff --git a/pokemon-gen7x/shiny/pikachu-hoenn-cap.png b/pokemon-gen7x/shiny/pikachu-hoenn-cap.png index 29bdc040..b2f9e452 100644 Binary files a/pokemon-gen7x/shiny/pikachu-hoenn-cap.png and b/pokemon-gen7x/shiny/pikachu-hoenn-cap.png differ diff --git a/pokemon-gen7x/shiny/pikachu-kalos-cap.png b/pokemon-gen7x/shiny/pikachu-kalos-cap.png index 100620b8..78ecf4bb 100644 Binary files a/pokemon-gen7x/shiny/pikachu-kalos-cap.png and b/pokemon-gen7x/shiny/pikachu-kalos-cap.png differ diff --git a/pokemon-gen7x/shiny/pikachu-libre.png b/pokemon-gen7x/shiny/pikachu-libre.png index 98dd6ab6..980f322f 100644 Binary files a/pokemon-gen7x/shiny/pikachu-libre.png and b/pokemon-gen7x/shiny/pikachu-libre.png differ diff --git a/pokemon-gen7x/shiny/pikachu-original-cap.png b/pokemon-gen7x/shiny/pikachu-original-cap.png index adba5b72..7d6f53dd 100644 Binary files a/pokemon-gen7x/shiny/pikachu-original-cap.png and b/pokemon-gen7x/shiny/pikachu-original-cap.png differ diff --git a/pokemon-gen7x/shiny/pikachu-partner-cap.png b/pokemon-gen7x/shiny/pikachu-partner-cap.png index 8ef25888..2a4df0f7 100644 Binary files a/pokemon-gen7x/shiny/pikachu-partner-cap.png and b/pokemon-gen7x/shiny/pikachu-partner-cap.png differ diff --git a/pokemon-gen7x/shiny/pikachu-phd.png b/pokemon-gen7x/shiny/pikachu-phd.png index ad57551a..dd1438c3 100644 Binary files a/pokemon-gen7x/shiny/pikachu-phd.png and b/pokemon-gen7x/shiny/pikachu-phd.png differ diff --git a/pokemon-gen7x/shiny/pikachu-pop-star.png b/pokemon-gen7x/shiny/pikachu-pop-star.png index 11e2c02e..81cc31dd 100644 Binary files a/pokemon-gen7x/shiny/pikachu-pop-star.png and b/pokemon-gen7x/shiny/pikachu-pop-star.png differ diff --git a/pokemon-gen7x/shiny/pikachu-rock-star.png b/pokemon-gen7x/shiny/pikachu-rock-star.png index 215d32fb..c54b0398 100644 Binary files a/pokemon-gen7x/shiny/pikachu-rock-star.png and b/pokemon-gen7x/shiny/pikachu-rock-star.png differ diff --git a/pokemon-gen7x/shiny/pikachu-sinnoh-cap.png b/pokemon-gen7x/shiny/pikachu-sinnoh-cap.png index 9d1df4ae..08707e52 100644 Binary files a/pokemon-gen7x/shiny/pikachu-sinnoh-cap.png and b/pokemon-gen7x/shiny/pikachu-sinnoh-cap.png differ diff --git a/pokemon-gen7x/shiny/pikachu-starter.png b/pokemon-gen7x/shiny/pikachu-starter.png index 476e0281..01b127e1 100644 Binary files a/pokemon-gen7x/shiny/pikachu-starter.png and b/pokemon-gen7x/shiny/pikachu-starter.png differ diff --git a/pokemon-gen7x/shiny/pikachu-unova-cap.png b/pokemon-gen7x/shiny/pikachu-unova-cap.png index 8938d1f6..1fba65a6 100644 Binary files a/pokemon-gen7x/shiny/pikachu-unova-cap.png and b/pokemon-gen7x/shiny/pikachu-unova-cap.png differ diff --git a/pokemon-gen7x/shiny/pikachu-world-cap.png b/pokemon-gen7x/shiny/pikachu-world-cap.png new file mode 100644 index 00000000..2928d44c Binary files /dev/null and b/pokemon-gen7x/shiny/pikachu-world-cap.png differ diff --git a/pokemon-gen7x/shiny/pikachu.png b/pokemon-gen7x/shiny/pikachu.png index 5ba1dfc9..efa76059 100644 Binary files a/pokemon-gen7x/shiny/pikachu.png and b/pokemon-gen7x/shiny/pikachu.png differ diff --git a/pokemon-gen8/regular/alakazam.png b/pokemon-gen8/regular/alakazam.png index 49777a37..e3a9ed78 100644 Binary files a/pokemon-gen8/regular/alakazam.png and b/pokemon-gen8/regular/alakazam.png differ diff --git a/pokemon-gen8/regular/amoonguss.png b/pokemon-gen8/regular/amoonguss.png index 15a18e7d..ea0321a4 100644 Binary files a/pokemon-gen8/regular/amoonguss.png and b/pokemon-gen8/regular/amoonguss.png differ diff --git a/pokemon-gen8/regular/azumarill.png b/pokemon-gen8/regular/azumarill.png index e0b0954b..31659743 100644 Binary files a/pokemon-gen8/regular/azumarill.png and b/pokemon-gen8/regular/azumarill.png differ diff --git a/pokemon-gen8/regular/blastoise-gmax.png b/pokemon-gen8/regular/blastoise-gmax.png new file mode 100644 index 00000000..4d987e9d Binary files /dev/null and b/pokemon-gen8/regular/blastoise-gmax.png differ diff --git a/pokemon-gen8/regular/blissey.png b/pokemon-gen8/regular/blissey.png index 2a43ef21..6d8ef40f 100644 Binary files a/pokemon-gen8/regular/blissey.png and b/pokemon-gen8/regular/blissey.png differ diff --git a/pokemon-gen8/regular/bouffalant.png b/pokemon-gen8/regular/bouffalant.png index eab72822..94af7d7f 100644 Binary files a/pokemon-gen8/regular/bouffalant.png and b/pokemon-gen8/regular/bouffalant.png differ diff --git a/pokemon-gen8/regular/cinderace-gmax.png b/pokemon-gen8/regular/cinderace-gmax.png new file mode 100644 index 00000000..a8433acc Binary files /dev/null and b/pokemon-gen8/regular/cinderace-gmax.png differ diff --git a/pokemon-gen8/regular/clawitzer.png b/pokemon-gen8/regular/clawitzer.png index 2142705c..6c3cdf0e 100644 Binary files a/pokemon-gen8/regular/clawitzer.png and b/pokemon-gen8/regular/clawitzer.png differ diff --git a/pokemon-gen8/regular/comfey.png b/pokemon-gen8/regular/comfey.png index ed80673c..be50a9d5 100644 Binary files a/pokemon-gen8/regular/comfey.png and b/pokemon-gen8/regular/comfey.png differ diff --git a/pokemon-gen8/regular/dedenne.png b/pokemon-gen8/regular/dedenne.png index 42d99bf0..8b00b094 100644 Binary files a/pokemon-gen8/regular/dedenne.png and b/pokemon-gen8/regular/dedenne.png differ diff --git a/pokemon-gen8/regular/dragalge.png b/pokemon-gen8/regular/dragalge.png index d99fd384..c5807447 100644 Binary files a/pokemon-gen8/regular/dragalge.png and b/pokemon-gen8/regular/dragalge.png differ diff --git a/pokemon-gen8/regular/druddigon.png b/pokemon-gen8/regular/druddigon.png index 7de8770b..2b99e919 100644 Binary files a/pokemon-gen8/regular/druddigon.png and b/pokemon-gen8/regular/druddigon.png differ diff --git a/pokemon-gen8/regular/dunsparce.png b/pokemon-gen8/regular/dunsparce.png index 7ead0c3f..f843f160 100644 Binary files a/pokemon-gen8/regular/dunsparce.png and b/pokemon-gen8/regular/dunsparce.png differ diff --git a/pokemon-gen8/regular/emolga.png b/pokemon-gen8/regular/emolga.png index 51034f9e..0b0e74dc 100644 Binary files a/pokemon-gen8/regular/emolga.png and b/pokemon-gen8/regular/emolga.png differ diff --git a/pokemon-gen8/regular/exeggutor-alola.png b/pokemon-gen8/regular/exeggutor-alola.png index 13c09c95..bd86c465 100644 Binary files a/pokemon-gen8/regular/exeggutor-alola.png and b/pokemon-gen8/regular/exeggutor-alola.png differ diff --git a/pokemon-gen8/regular/exeggutor.png b/pokemon-gen8/regular/exeggutor.png index 4e7fced9..c033d6aa 100644 Binary files a/pokemon-gen8/regular/exeggutor.png and b/pokemon-gen8/regular/exeggutor.png differ diff --git a/pokemon-gen8/regular/exploud.png b/pokemon-gen8/regular/exploud.png index 951972fb..b8bc9e69 100644 Binary files a/pokemon-gen8/regular/exploud.png and b/pokemon-gen8/regular/exploud.png differ diff --git a/pokemon-gen8/regular/female/pikachu-alola-cap.png b/pokemon-gen8/regular/female/pikachu-alola-cap.png new file mode 100644 index 00000000..2854641b Binary files /dev/null and b/pokemon-gen8/regular/female/pikachu-alola-cap.png differ diff --git a/pokemon-gen8/regular/female/pikachu-hoenn-cap.png b/pokemon-gen8/regular/female/pikachu-hoenn-cap.png new file mode 100644 index 00000000..3a94540d Binary files /dev/null and b/pokemon-gen8/regular/female/pikachu-hoenn-cap.png differ diff --git a/pokemon-gen8/regular/female/pikachu-kalos-cap.png b/pokemon-gen8/regular/female/pikachu-kalos-cap.png new file mode 100644 index 00000000..660724f1 Binary files /dev/null and b/pokemon-gen8/regular/female/pikachu-kalos-cap.png differ diff --git a/pokemon-gen8/regular/female/pikachu-original-cap.png b/pokemon-gen8/regular/female/pikachu-original-cap.png new file mode 100644 index 00000000..af4c025d Binary files /dev/null and b/pokemon-gen8/regular/female/pikachu-original-cap.png differ diff --git a/pokemon-gen8/regular/female/pikachu-partner-cap.png b/pokemon-gen8/regular/female/pikachu-partner-cap.png new file mode 100644 index 00000000..58021bc2 Binary files /dev/null and b/pokemon-gen8/regular/female/pikachu-partner-cap.png differ diff --git a/pokemon-gen8/regular/female/pikachu-sinnoh-cap.png b/pokemon-gen8/regular/female/pikachu-sinnoh-cap.png new file mode 100644 index 00000000..ee9a5880 Binary files /dev/null and b/pokemon-gen8/regular/female/pikachu-sinnoh-cap.png differ diff --git a/pokemon-gen8/regular/female/pikachu-starter.png b/pokemon-gen8/regular/female/pikachu-starter.png new file mode 100644 index 00000000..30c43295 Binary files /dev/null and b/pokemon-gen8/regular/female/pikachu-starter.png differ diff --git a/pokemon-gen8/regular/female/pikachu-unova-cap.png b/pokemon-gen8/regular/female/pikachu-unova-cap.png new file mode 100644 index 00000000..66bcdf5c Binary files /dev/null and b/pokemon-gen8/regular/female/pikachu-unova-cap.png differ diff --git a/pokemon-gen8/regular/female/pikachu-world-cap.png b/pokemon-gen8/regular/female/pikachu-world-cap.png new file mode 100644 index 00000000..4f5471f2 Binary files /dev/null and b/pokemon-gen8/regular/female/pikachu-world-cap.png differ diff --git a/pokemon-gen8/regular/female/pikachu.png b/pokemon-gen8/regular/female/pikachu.png new file mode 100644 index 00000000..f7838c8d Binary files /dev/null and b/pokemon-gen8/regular/female/pikachu.png differ diff --git a/pokemon-gen8/regular/golduck.png b/pokemon-gen8/regular/golduck.png index 08de327c..02260fa6 100644 Binary files a/pokemon-gen8/regular/golduck.png and b/pokemon-gen8/regular/golduck.png differ diff --git a/pokemon-gen8/regular/heracross.png b/pokemon-gen8/regular/heracross.png index 2175b4bb..1d966b03 100644 Binary files a/pokemon-gen8/regular/heracross.png and b/pokemon-gen8/regular/heracross.png differ diff --git a/pokemon-gen8/regular/inteleon-gmax.png b/pokemon-gen8/regular/inteleon-gmax.png new file mode 100644 index 00000000..ce3ba62b Binary files /dev/null and b/pokemon-gen8/regular/inteleon-gmax.png differ diff --git a/pokemon-gen8/regular/kadabra.png b/pokemon-gen8/regular/kadabra.png index 6c4d3f81..59bad093 100644 Binary files a/pokemon-gen8/regular/kadabra.png and b/pokemon-gen8/regular/kadabra.png differ diff --git a/pokemon-gen8/regular/kangaskhan.png b/pokemon-gen8/regular/kangaskhan.png index 1edc3b1c..faee4606 100644 Binary files a/pokemon-gen8/regular/kangaskhan.png and b/pokemon-gen8/regular/kangaskhan.png differ diff --git a/pokemon-gen8/regular/kingdra.png b/pokemon-gen8/regular/kingdra.png index 8aa50bef..471877ca 100644 Binary files a/pokemon-gen8/regular/kingdra.png and b/pokemon-gen8/regular/kingdra.png differ diff --git a/pokemon-gen8/regular/klefki.png b/pokemon-gen8/regular/klefki.png index f4dea730..80478c9e 100644 Binary files a/pokemon-gen8/regular/klefki.png and b/pokemon-gen8/regular/klefki.png differ diff --git a/pokemon-gen8/regular/krookodile.png b/pokemon-gen8/regular/krookodile.png index 77a528bf..58ed5560 100644 Binary files a/pokemon-gen8/regular/krookodile.png and b/pokemon-gen8/regular/krookodile.png differ diff --git a/pokemon-gen8/regular/kubfu.png b/pokemon-gen8/regular/kubfu.png new file mode 100644 index 00000000..35850c29 Binary files /dev/null and b/pokemon-gen8/regular/kubfu.png differ diff --git a/pokemon-gen8/regular/lickilicky.png b/pokemon-gen8/regular/lickilicky.png index 5997c6ec..4557598d 100644 Binary files a/pokemon-gen8/regular/lickilicky.png and b/pokemon-gen8/regular/lickilicky.png differ diff --git a/pokemon-gen8/regular/lilligant.png b/pokemon-gen8/regular/lilligant.png index b7a35d5f..16a10e7a 100644 Binary files a/pokemon-gen8/regular/lilligant.png and b/pokemon-gen8/regular/lilligant.png differ diff --git a/pokemon-gen8/regular/lopunny.png b/pokemon-gen8/regular/lopunny.png index 435a1c21..685d5677 100644 Binary files a/pokemon-gen8/regular/lopunny.png and b/pokemon-gen8/regular/lopunny.png differ diff --git a/pokemon-gen8/regular/lurantis.png b/pokemon-gen8/regular/lurantis.png index 1bc57eab..8b17507c 100644 Binary files a/pokemon-gen8/regular/lurantis.png and b/pokemon-gen8/regular/lurantis.png differ diff --git a/pokemon-gen8/regular/luxray.png b/pokemon-gen8/regular/luxray.png index 30936a54..e39f1e6d 100644 Binary files a/pokemon-gen8/regular/luxray.png and b/pokemon-gen8/regular/luxray.png differ diff --git a/pokemon-gen8/regular/lycanroc-dusk.png b/pokemon-gen8/regular/lycanroc-dusk.png index edad8e8a..81e2780e 100644 Binary files a/pokemon-gen8/regular/lycanroc-dusk.png and b/pokemon-gen8/regular/lycanroc-dusk.png differ diff --git a/pokemon-gen8/regular/lycanroc-midnight.png b/pokemon-gen8/regular/lycanroc-midnight.png index 7f61f7b6..e5dc4343 100644 Binary files a/pokemon-gen8/regular/lycanroc-midnight.png and b/pokemon-gen8/regular/lycanroc-midnight.png differ diff --git a/pokemon-gen8/regular/lycanroc.png b/pokemon-gen8/regular/lycanroc.png index a411e463..6caa0370 100644 Binary files a/pokemon-gen8/regular/lycanroc.png and b/pokemon-gen8/regular/lycanroc.png differ diff --git a/pokemon-gen8/regular/magearna-original.png b/pokemon-gen8/regular/magearna-original.png index 710fcb29..2b8892d5 100644 Binary files a/pokemon-gen8/regular/magearna-original.png and b/pokemon-gen8/regular/magearna-original.png differ diff --git a/pokemon-gen8/regular/magearna.png b/pokemon-gen8/regular/magearna.png index b0cf8ff6..5443ce3f 100644 Binary files a/pokemon-gen8/regular/magearna.png and b/pokemon-gen8/regular/magearna.png differ diff --git a/pokemon-gen8/regular/magneton.png b/pokemon-gen8/regular/magneton.png index 66a84dfd..dc966c35 100644 Binary files a/pokemon-gen8/regular/magneton.png and b/pokemon-gen8/regular/magneton.png differ diff --git a/pokemon-gen8/regular/magnezone.png b/pokemon-gen8/regular/magnezone.png index 54a32c37..e4326edd 100644 Binary files a/pokemon-gen8/regular/magnezone.png and b/pokemon-gen8/regular/magnezone.png differ diff --git a/pokemon-gen8/regular/marowak-alola.png b/pokemon-gen8/regular/marowak-alola.png index 9acfd902..7d80a48f 100644 Binary files a/pokemon-gen8/regular/marowak-alola.png and b/pokemon-gen8/regular/marowak-alola.png differ diff --git a/pokemon-gen8/regular/marowak.png b/pokemon-gen8/regular/marowak.png index b8826d2c..5794c4d6 100644 Binary files a/pokemon-gen8/regular/marowak.png and b/pokemon-gen8/regular/marowak.png differ diff --git a/pokemon-gen8/regular/mienshao.png b/pokemon-gen8/regular/mienshao.png index 9836b351..a93eb702 100644 Binary files a/pokemon-gen8/regular/mienshao.png and b/pokemon-gen8/regular/mienshao.png differ diff --git a/pokemon-gen8/regular/miltank.png b/pokemon-gen8/regular/miltank.png index e18a7a6f..6b0d591a 100644 Binary files a/pokemon-gen8/regular/miltank.png and b/pokemon-gen8/regular/miltank.png differ diff --git a/pokemon-gen8/regular/palossand.png b/pokemon-gen8/regular/palossand.png index d3003a40..f101fb44 100644 Binary files a/pokemon-gen8/regular/palossand.png and b/pokemon-gen8/regular/palossand.png differ diff --git a/pokemon-gen8/regular/pikachu-alola-cap.png b/pokemon-gen8/regular/pikachu-alola-cap.png index 340a86ce..9b31e600 100644 Binary files a/pokemon-gen8/regular/pikachu-alola-cap.png and b/pokemon-gen8/regular/pikachu-alola-cap.png differ diff --git a/pokemon-gen8/regular/pikachu-belle.png b/pokemon-gen8/regular/pikachu-belle.png index b626770c..5a56b73d 100644 Binary files a/pokemon-gen8/regular/pikachu-belle.png and b/pokemon-gen8/regular/pikachu-belle.png differ diff --git a/pokemon-gen8/regular/pikachu-cosplay.png b/pokemon-gen8/regular/pikachu-cosplay.png index 52737454..ad063d29 100644 Binary files a/pokemon-gen8/regular/pikachu-cosplay.png and b/pokemon-gen8/regular/pikachu-cosplay.png differ diff --git a/pokemon-gen8/regular/pikachu-hoenn-cap.png b/pokemon-gen8/regular/pikachu-hoenn-cap.png index b150af63..bd357517 100644 Binary files a/pokemon-gen8/regular/pikachu-hoenn-cap.png and b/pokemon-gen8/regular/pikachu-hoenn-cap.png differ diff --git a/pokemon-gen8/regular/pikachu-kalos-cap.png b/pokemon-gen8/regular/pikachu-kalos-cap.png index cbe5ab9f..4d93ec9a 100644 Binary files a/pokemon-gen8/regular/pikachu-kalos-cap.png and b/pokemon-gen8/regular/pikachu-kalos-cap.png differ diff --git a/pokemon-gen8/regular/pikachu-libre.png b/pokemon-gen8/regular/pikachu-libre.png index e1f41396..ef4445d5 100644 Binary files a/pokemon-gen8/regular/pikachu-libre.png and b/pokemon-gen8/regular/pikachu-libre.png differ diff --git a/pokemon-gen8/regular/pikachu-original-cap.png b/pokemon-gen8/regular/pikachu-original-cap.png index 9b5ba3f5..8cf6ce3f 100644 Binary files a/pokemon-gen8/regular/pikachu-original-cap.png and b/pokemon-gen8/regular/pikachu-original-cap.png differ diff --git a/pokemon-gen8/regular/pikachu-partner-cap.png b/pokemon-gen8/regular/pikachu-partner-cap.png index b05751ae..7745afb5 100644 Binary files a/pokemon-gen8/regular/pikachu-partner-cap.png and b/pokemon-gen8/regular/pikachu-partner-cap.png differ diff --git a/pokemon-gen8/regular/pikachu-phd.png b/pokemon-gen8/regular/pikachu-phd.png index b1a7f6c7..ff5609d6 100644 Binary files a/pokemon-gen8/regular/pikachu-phd.png and b/pokemon-gen8/regular/pikachu-phd.png differ diff --git a/pokemon-gen8/regular/pikachu-pop-star.png b/pokemon-gen8/regular/pikachu-pop-star.png index d95a0e44..6bb235d2 100644 Binary files a/pokemon-gen8/regular/pikachu-pop-star.png and b/pokemon-gen8/regular/pikachu-pop-star.png differ diff --git a/pokemon-gen8/regular/pikachu-rock-star.png b/pokemon-gen8/regular/pikachu-rock-star.png index 362240ea..0b8f9195 100644 Binary files a/pokemon-gen8/regular/pikachu-rock-star.png and b/pokemon-gen8/regular/pikachu-rock-star.png differ diff --git a/pokemon-gen8/regular/pikachu-sinnoh-cap.png b/pokemon-gen8/regular/pikachu-sinnoh-cap.png index 60e1514b..c8c18ed1 100644 Binary files a/pokemon-gen8/regular/pikachu-sinnoh-cap.png and b/pokemon-gen8/regular/pikachu-sinnoh-cap.png differ diff --git a/pokemon-gen8/regular/pikachu-starter.png b/pokemon-gen8/regular/pikachu-starter.png index 1ad4e3bb..413b5119 100644 Binary files a/pokemon-gen8/regular/pikachu-starter.png and b/pokemon-gen8/regular/pikachu-starter.png differ diff --git a/pokemon-gen8/regular/pikachu-unova-cap.png b/pokemon-gen8/regular/pikachu-unova-cap.png index 20e4520b..dd10b5b0 100644 Binary files a/pokemon-gen8/regular/pikachu-unova-cap.png and b/pokemon-gen8/regular/pikachu-unova-cap.png differ diff --git a/pokemon-gen8/regular/pikachu-world-cap.png b/pokemon-gen8/regular/pikachu-world-cap.png new file mode 100644 index 00000000..691fd9cc Binary files /dev/null and b/pokemon-gen8/regular/pikachu-world-cap.png differ diff --git a/pokemon-gen8/regular/pikachu.png b/pokemon-gen8/regular/pikachu.png index 04a713f6..4021a402 100644 Binary files a/pokemon-gen8/regular/pikachu.png and b/pokemon-gen8/regular/pikachu.png differ diff --git a/pokemon-gen8/regular/pinsir.png b/pokemon-gen8/regular/pinsir.png index 3d73df1e..88856ef9 100644 Binary files a/pokemon-gen8/regular/pinsir.png and b/pokemon-gen8/regular/pinsir.png differ diff --git a/pokemon-gen8/regular/politoed.png b/pokemon-gen8/regular/politoed.png index daa84057..d6c9702c 100644 Binary files a/pokemon-gen8/regular/politoed.png and b/pokemon-gen8/regular/politoed.png differ diff --git a/pokemon-gen8/regular/poliwrath.png b/pokemon-gen8/regular/poliwrath.png index e6e78255..8b09cad8 100644 Binary files a/pokemon-gen8/regular/poliwrath.png and b/pokemon-gen8/regular/poliwrath.png differ diff --git a/pokemon-gen8/regular/porygon-z.png b/pokemon-gen8/regular/porygon-z.png index 6328eae9..7dc9e0b7 100644 Binary files a/pokemon-gen8/regular/porygon-z.png and b/pokemon-gen8/regular/porygon-z.png differ diff --git a/pokemon-gen8/regular/porygon2.png b/pokemon-gen8/regular/porygon2.png index ea5cd249..5271fba6 100644 Binary files a/pokemon-gen8/regular/porygon2.png and b/pokemon-gen8/regular/porygon2.png differ diff --git a/pokemon-gen8/regular/rillaboom-gmax.png b/pokemon-gen8/regular/rillaboom-gmax.png new file mode 100644 index 00000000..4f18b34c Binary files /dev/null and b/pokemon-gen8/regular/rillaboom-gmax.png differ diff --git a/pokemon-gen8/regular/sandslash.png b/pokemon-gen8/regular/sandslash.png index 3ef1b71c..64d6496c 100644 Binary files a/pokemon-gen8/regular/sandslash.png and b/pokemon-gen8/regular/sandslash.png differ diff --git a/pokemon-gen8/regular/scizor.png b/pokemon-gen8/regular/scizor.png index 0c7c0fa7..33d7a309 100644 Binary files a/pokemon-gen8/regular/scizor.png and b/pokemon-gen8/regular/scizor.png differ diff --git a/pokemon-gen8/regular/scolipede.png b/pokemon-gen8/regular/scolipede.png index 1ab680f8..bbfe86df 100644 Binary files a/pokemon-gen8/regular/scolipede.png and b/pokemon-gen8/regular/scolipede.png differ diff --git a/pokemon-gen8/regular/scyther.png b/pokemon-gen8/regular/scyther.png index 04febd54..ed814653 100644 Binary files a/pokemon-gen8/regular/scyther.png and b/pokemon-gen8/regular/scyther.png differ diff --git a/pokemon-gen8/regular/sharpedo.png b/pokemon-gen8/regular/sharpedo.png index a81f2005..df7adb66 100644 Binary files a/pokemon-gen8/regular/sharpedo.png and b/pokemon-gen8/regular/sharpedo.png differ diff --git a/pokemon-gen8/regular/skarmory.png b/pokemon-gen8/regular/skarmory.png index 5d8a0695..81fbca27 100644 Binary files a/pokemon-gen8/regular/skarmory.png and b/pokemon-gen8/regular/skarmory.png differ diff --git a/pokemon-gen8/regular/slowbro-galar.png b/pokemon-gen8/regular/slowbro-galar.png new file mode 100644 index 00000000..81817993 Binary files /dev/null and b/pokemon-gen8/regular/slowbro-galar.png differ diff --git a/pokemon-gen8/regular/slowbro.png b/pokemon-gen8/regular/slowbro.png index b8975084..99f25fcc 100644 Binary files a/pokemon-gen8/regular/slowbro.png and b/pokemon-gen8/regular/slowbro.png differ diff --git a/pokemon-gen8/regular/slowking.png b/pokemon-gen8/regular/slowking.png index bdd92a55..83f81b36 100644 Binary files a/pokemon-gen8/regular/slowking.png and b/pokemon-gen8/regular/slowking.png differ diff --git a/pokemon-gen8/regular/starmie.png b/pokemon-gen8/regular/starmie.png index 7b835c48..b88d689a 100644 Binary files a/pokemon-gen8/regular/starmie.png and b/pokemon-gen8/regular/starmie.png differ diff --git a/pokemon-gen8/regular/stoutland.png b/pokemon-gen8/regular/stoutland.png index 0da22719..e0ce9899 100644 Binary files a/pokemon-gen8/regular/stoutland.png and b/pokemon-gen8/regular/stoutland.png differ diff --git a/pokemon-gen8/regular/talonflame.png b/pokemon-gen8/regular/talonflame.png index 1d972eba..d3967084 100644 Binary files a/pokemon-gen8/regular/talonflame.png and b/pokemon-gen8/regular/talonflame.png differ diff --git a/pokemon-gen8/regular/tangrowth.png b/pokemon-gen8/regular/tangrowth.png index b6c29f30..d90cc25c 100644 Binary files a/pokemon-gen8/regular/tangrowth.png and b/pokemon-gen8/regular/tangrowth.png differ diff --git a/pokemon-gen8/regular/tauros.png b/pokemon-gen8/regular/tauros.png index 1773743f..6f43c796 100644 Binary files a/pokemon-gen8/regular/tauros.png and b/pokemon-gen8/regular/tauros.png differ diff --git a/pokemon-gen8/regular/tentacruel.png b/pokemon-gen8/regular/tentacruel.png index 73202bd7..2928b749 100644 Binary files a/pokemon-gen8/regular/tentacruel.png and b/pokemon-gen8/regular/tentacruel.png differ diff --git a/pokemon-gen8/regular/tyranitar.png b/pokemon-gen8/regular/tyranitar.png index 88fdd595..c8209e33 100644 Binary files a/pokemon-gen8/regular/tyranitar.png and b/pokemon-gen8/regular/tyranitar.png differ diff --git a/pokemon-gen8/regular/urshifu-gmax.png b/pokemon-gen8/regular/urshifu-gmax.png new file mode 100644 index 00000000..6e5c398a Binary files /dev/null and b/pokemon-gen8/regular/urshifu-gmax.png differ diff --git a/pokemon-gen8/regular/urshifu-rapid-strike-gmax.png b/pokemon-gen8/regular/urshifu-rapid-strike-gmax.png new file mode 100644 index 00000000..a315e10e Binary files /dev/null and b/pokemon-gen8/regular/urshifu-rapid-strike-gmax.png differ diff --git a/pokemon-gen8/regular/urshifu.png b/pokemon-gen8/regular/urshifu.png new file mode 100644 index 00000000..c23325e9 Binary files /dev/null and b/pokemon-gen8/regular/urshifu.png differ diff --git a/pokemon-gen8/regular/venusaur-gmax.png b/pokemon-gen8/regular/venusaur-gmax.png new file mode 100644 index 00000000..3da0b960 Binary files /dev/null and b/pokemon-gen8/regular/venusaur-gmax.png differ diff --git a/pokemon-gen8/regular/venusaur.png b/pokemon-gen8/regular/venusaur.png index e2880e4d..1f7cdc4f 100644 Binary files a/pokemon-gen8/regular/venusaur.png and b/pokemon-gen8/regular/venusaur.png differ diff --git a/pokemon-gen8/regular/volcarona.png b/pokemon-gen8/regular/volcarona.png index bad4f7b3..89e101c6 100644 Binary files a/pokemon-gen8/regular/volcarona.png and b/pokemon-gen8/regular/volcarona.png differ diff --git a/pokemon-gen8/regular/wigglytuff.png b/pokemon-gen8/regular/wigglytuff.png index 2433dd4a..586867da 100644 Binary files a/pokemon-gen8/regular/wigglytuff.png and b/pokemon-gen8/regular/wigglytuff.png differ diff --git a/pokemon-gen8/regular/zarude-dada.png b/pokemon-gen8/regular/zarude-dada.png new file mode 100644 index 00000000..73e8dac4 Binary files /dev/null and b/pokemon-gen8/regular/zarude-dada.png differ diff --git a/pokemon-gen8/regular/zarude.png b/pokemon-gen8/regular/zarude.png new file mode 100644 index 00000000..a1d13d4c Binary files /dev/null and b/pokemon-gen8/regular/zarude.png differ diff --git a/pokemon-gen8/regular/zoroark.png b/pokemon-gen8/regular/zoroark.png index 0bf34f8f..37b3c4ea 100644 Binary files a/pokemon-gen8/regular/zoroark.png and b/pokemon-gen8/regular/zoroark.png differ diff --git a/pokemon-gen8/shiny/alakazam.png b/pokemon-gen8/shiny/alakazam.png index 2d62fb3f..4fce323b 100644 Binary files a/pokemon-gen8/shiny/alakazam.png and b/pokemon-gen8/shiny/alakazam.png differ diff --git a/pokemon-gen8/shiny/amoonguss.png b/pokemon-gen8/shiny/amoonguss.png index 59cb68ba..b7ffcf43 100644 Binary files a/pokemon-gen8/shiny/amoonguss.png and b/pokemon-gen8/shiny/amoonguss.png differ diff --git a/pokemon-gen8/shiny/azumarill.png b/pokemon-gen8/shiny/azumarill.png index 54332541..131e0016 100644 Binary files a/pokemon-gen8/shiny/azumarill.png and b/pokemon-gen8/shiny/azumarill.png differ diff --git a/pokemon-gen8/shiny/blastoise-gmax.png b/pokemon-gen8/shiny/blastoise-gmax.png new file mode 100644 index 00000000..ef429132 Binary files /dev/null and b/pokemon-gen8/shiny/blastoise-gmax.png differ diff --git a/pokemon-gen8/shiny/blissey.png b/pokemon-gen8/shiny/blissey.png index 88a584e1..b0faf3a7 100644 Binary files a/pokemon-gen8/shiny/blissey.png and b/pokemon-gen8/shiny/blissey.png differ diff --git a/pokemon-gen8/shiny/bouffalant.png b/pokemon-gen8/shiny/bouffalant.png index 965a248c..387703e5 100644 Binary files a/pokemon-gen8/shiny/bouffalant.png and b/pokemon-gen8/shiny/bouffalant.png differ diff --git a/pokemon-gen8/shiny/cinderace-gmax.png b/pokemon-gen8/shiny/cinderace-gmax.png new file mode 100644 index 00000000..ac0f55af Binary files /dev/null and b/pokemon-gen8/shiny/cinderace-gmax.png differ diff --git a/pokemon-gen8/shiny/clawitzer.png b/pokemon-gen8/shiny/clawitzer.png index 3f0b8493..c9757680 100644 Binary files a/pokemon-gen8/shiny/clawitzer.png and b/pokemon-gen8/shiny/clawitzer.png differ diff --git a/pokemon-gen8/shiny/comfey.png b/pokemon-gen8/shiny/comfey.png index 4fead3b0..f32e0b58 100644 Binary files a/pokemon-gen8/shiny/comfey.png and b/pokemon-gen8/shiny/comfey.png differ diff --git a/pokemon-gen8/shiny/dedenne.png b/pokemon-gen8/shiny/dedenne.png index 4e803508..261ec2c6 100644 Binary files a/pokemon-gen8/shiny/dedenne.png and b/pokemon-gen8/shiny/dedenne.png differ diff --git a/pokemon-gen8/shiny/dragalge.png b/pokemon-gen8/shiny/dragalge.png index c9321497..72205850 100644 Binary files a/pokemon-gen8/shiny/dragalge.png and b/pokemon-gen8/shiny/dragalge.png differ diff --git a/pokemon-gen8/shiny/druddigon.png b/pokemon-gen8/shiny/druddigon.png index 780691ef..416018b5 100644 Binary files a/pokemon-gen8/shiny/druddigon.png and b/pokemon-gen8/shiny/druddigon.png differ diff --git a/pokemon-gen8/shiny/dunsparce.png b/pokemon-gen8/shiny/dunsparce.png index 520880b6..89e24a03 100644 Binary files a/pokemon-gen8/shiny/dunsparce.png and b/pokemon-gen8/shiny/dunsparce.png differ diff --git a/pokemon-gen8/shiny/emolga.png b/pokemon-gen8/shiny/emolga.png index 91eb54ba..13a07a5a 100644 Binary files a/pokemon-gen8/shiny/emolga.png and b/pokemon-gen8/shiny/emolga.png differ diff --git a/pokemon-gen8/shiny/exeggutor-alola.png b/pokemon-gen8/shiny/exeggutor-alola.png index 18b283ac..1c2ab2cd 100644 Binary files a/pokemon-gen8/shiny/exeggutor-alola.png and b/pokemon-gen8/shiny/exeggutor-alola.png differ diff --git a/pokemon-gen8/shiny/exeggutor.png b/pokemon-gen8/shiny/exeggutor.png index d2387e14..a5cca0ab 100644 Binary files a/pokemon-gen8/shiny/exeggutor.png and b/pokemon-gen8/shiny/exeggutor.png differ diff --git a/pokemon-gen8/shiny/exploud.png b/pokemon-gen8/shiny/exploud.png index 692d5599..57b86900 100644 Binary files a/pokemon-gen8/shiny/exploud.png and b/pokemon-gen8/shiny/exploud.png differ diff --git a/pokemon-gen8/shiny/female/pikachu-alola-cap.png b/pokemon-gen8/shiny/female/pikachu-alola-cap.png new file mode 100644 index 00000000..626f1734 Binary files /dev/null and b/pokemon-gen8/shiny/female/pikachu-alola-cap.png differ diff --git a/pokemon-gen8/shiny/female/pikachu-hoenn-cap.png b/pokemon-gen8/shiny/female/pikachu-hoenn-cap.png new file mode 100644 index 00000000..fba80828 Binary files /dev/null and b/pokemon-gen8/shiny/female/pikachu-hoenn-cap.png differ diff --git a/pokemon-gen8/shiny/female/pikachu-kalos-cap.png b/pokemon-gen8/shiny/female/pikachu-kalos-cap.png new file mode 100644 index 00000000..aef98f28 Binary files /dev/null and b/pokemon-gen8/shiny/female/pikachu-kalos-cap.png differ diff --git a/pokemon-gen8/shiny/female/pikachu-original-cap.png b/pokemon-gen8/shiny/female/pikachu-original-cap.png new file mode 100644 index 00000000..c1571923 Binary files /dev/null and b/pokemon-gen8/shiny/female/pikachu-original-cap.png differ diff --git a/pokemon-gen8/shiny/female/pikachu-partner-cap.png b/pokemon-gen8/shiny/female/pikachu-partner-cap.png new file mode 100644 index 00000000..a15a330b Binary files /dev/null and b/pokemon-gen8/shiny/female/pikachu-partner-cap.png differ diff --git a/pokemon-gen8/shiny/female/pikachu-sinnoh-cap.png b/pokemon-gen8/shiny/female/pikachu-sinnoh-cap.png new file mode 100644 index 00000000..3d89d8d7 Binary files /dev/null and b/pokemon-gen8/shiny/female/pikachu-sinnoh-cap.png differ diff --git a/pokemon-gen8/shiny/female/pikachu-starter.png b/pokemon-gen8/shiny/female/pikachu-starter.png new file mode 100644 index 00000000..2b5a76ec Binary files /dev/null and b/pokemon-gen8/shiny/female/pikachu-starter.png differ diff --git a/pokemon-gen8/shiny/female/pikachu-unova-cap.png b/pokemon-gen8/shiny/female/pikachu-unova-cap.png new file mode 100644 index 00000000..62827742 Binary files /dev/null and b/pokemon-gen8/shiny/female/pikachu-unova-cap.png differ diff --git a/pokemon-gen8/shiny/female/pikachu-world-cap.png b/pokemon-gen8/shiny/female/pikachu-world-cap.png new file mode 100644 index 00000000..466caa06 Binary files /dev/null and b/pokemon-gen8/shiny/female/pikachu-world-cap.png differ diff --git a/pokemon-gen8/shiny/female/pikachu.png b/pokemon-gen8/shiny/female/pikachu.png new file mode 100644 index 00000000..3f024788 Binary files /dev/null and b/pokemon-gen8/shiny/female/pikachu.png differ diff --git a/pokemon-gen8/shiny/golduck.png b/pokemon-gen8/shiny/golduck.png index b128de73..0bf259dc 100644 Binary files a/pokemon-gen8/shiny/golduck.png and b/pokemon-gen8/shiny/golduck.png differ diff --git a/pokemon-gen8/shiny/heracross.png b/pokemon-gen8/shiny/heracross.png index 6dfa60bf..5256d32b 100644 Binary files a/pokemon-gen8/shiny/heracross.png and b/pokemon-gen8/shiny/heracross.png differ diff --git a/pokemon-gen8/shiny/inteleon-gmax.png b/pokemon-gen8/shiny/inteleon-gmax.png new file mode 100644 index 00000000..7f6bdbf8 Binary files /dev/null and b/pokemon-gen8/shiny/inteleon-gmax.png differ diff --git a/pokemon-gen8/shiny/inteleon.png b/pokemon-gen8/shiny/inteleon.png index 3ff2a27f..8c71fb9f 100644 Binary files a/pokemon-gen8/shiny/inteleon.png and b/pokemon-gen8/shiny/inteleon.png differ diff --git a/pokemon-gen8/shiny/kadabra.png b/pokemon-gen8/shiny/kadabra.png index fa8409e3..243ba714 100644 Binary files a/pokemon-gen8/shiny/kadabra.png and b/pokemon-gen8/shiny/kadabra.png differ diff --git a/pokemon-gen8/shiny/kangaskhan.png b/pokemon-gen8/shiny/kangaskhan.png index f688972b..33ebf782 100644 Binary files a/pokemon-gen8/shiny/kangaskhan.png and b/pokemon-gen8/shiny/kangaskhan.png differ diff --git a/pokemon-gen8/shiny/kingdra.png b/pokemon-gen8/shiny/kingdra.png index 2c194b12..4cb77b78 100644 Binary files a/pokemon-gen8/shiny/kingdra.png and b/pokemon-gen8/shiny/kingdra.png differ diff --git a/pokemon-gen8/shiny/klefki.png b/pokemon-gen8/shiny/klefki.png index ceadb565..424ad5ad 100644 Binary files a/pokemon-gen8/shiny/klefki.png and b/pokemon-gen8/shiny/klefki.png differ diff --git a/pokemon-gen8/shiny/krookodile.png b/pokemon-gen8/shiny/krookodile.png index 61dbc43c..e0eb103e 100644 Binary files a/pokemon-gen8/shiny/krookodile.png and b/pokemon-gen8/shiny/krookodile.png differ diff --git a/pokemon-gen8/shiny/kubfu.png b/pokemon-gen8/shiny/kubfu.png new file mode 100644 index 00000000..02409bed Binary files /dev/null and b/pokemon-gen8/shiny/kubfu.png differ diff --git a/pokemon-gen8/shiny/lickilicky.png b/pokemon-gen8/shiny/lickilicky.png index 6e3fc7fc..d00685b8 100644 Binary files a/pokemon-gen8/shiny/lickilicky.png and b/pokemon-gen8/shiny/lickilicky.png differ diff --git a/pokemon-gen8/shiny/lilligant.png b/pokemon-gen8/shiny/lilligant.png index 5a8ab03a..fccc553e 100644 Binary files a/pokemon-gen8/shiny/lilligant.png and b/pokemon-gen8/shiny/lilligant.png differ diff --git a/pokemon-gen8/shiny/lopunny.png b/pokemon-gen8/shiny/lopunny.png index fa1a14c1..1f6d04aa 100644 Binary files a/pokemon-gen8/shiny/lopunny.png and b/pokemon-gen8/shiny/lopunny.png differ diff --git a/pokemon-gen8/shiny/lurantis.png b/pokemon-gen8/shiny/lurantis.png index cd0769ee..26d2d88c 100644 Binary files a/pokemon-gen8/shiny/lurantis.png and b/pokemon-gen8/shiny/lurantis.png differ diff --git a/pokemon-gen8/shiny/luxray.png b/pokemon-gen8/shiny/luxray.png index dc5c3354..d47003a0 100644 Binary files a/pokemon-gen8/shiny/luxray.png and b/pokemon-gen8/shiny/luxray.png differ diff --git a/pokemon-gen8/shiny/lycanroc-dusk.png b/pokemon-gen8/shiny/lycanroc-dusk.png index 41584fcb..5350bfde 100644 Binary files a/pokemon-gen8/shiny/lycanroc-dusk.png and b/pokemon-gen8/shiny/lycanroc-dusk.png differ diff --git a/pokemon-gen8/shiny/lycanroc-midnight.png b/pokemon-gen8/shiny/lycanroc-midnight.png index dde2431e..ec6453d5 100644 Binary files a/pokemon-gen8/shiny/lycanroc-midnight.png and b/pokemon-gen8/shiny/lycanroc-midnight.png differ diff --git a/pokemon-gen8/shiny/lycanroc.png b/pokemon-gen8/shiny/lycanroc.png index 86cebecd..c91cf18d 100644 Binary files a/pokemon-gen8/shiny/lycanroc.png and b/pokemon-gen8/shiny/lycanroc.png differ diff --git a/pokemon-gen8/shiny/magearna-original.png b/pokemon-gen8/shiny/magearna-original.png index 4c499417..5db0b799 100644 Binary files a/pokemon-gen8/shiny/magearna-original.png and b/pokemon-gen8/shiny/magearna-original.png differ diff --git a/pokemon-gen8/shiny/magearna.png b/pokemon-gen8/shiny/magearna.png index fc09f9cd..297f08c7 100644 Binary files a/pokemon-gen8/shiny/magearna.png and b/pokemon-gen8/shiny/magearna.png differ diff --git a/pokemon-gen8/shiny/magneton.png b/pokemon-gen8/shiny/magneton.png index e416a876..f5164734 100644 Binary files a/pokemon-gen8/shiny/magneton.png and b/pokemon-gen8/shiny/magneton.png differ diff --git a/pokemon-gen8/shiny/magnezone.png b/pokemon-gen8/shiny/magnezone.png index d1e7379f..4ae74f14 100644 Binary files a/pokemon-gen8/shiny/magnezone.png and b/pokemon-gen8/shiny/magnezone.png differ diff --git a/pokemon-gen8/shiny/marowak-alola.png b/pokemon-gen8/shiny/marowak-alola.png index dfd9f537..d23f7418 100644 Binary files a/pokemon-gen8/shiny/marowak-alola.png and b/pokemon-gen8/shiny/marowak-alola.png differ diff --git a/pokemon-gen8/shiny/marowak.png b/pokemon-gen8/shiny/marowak.png index 82cd8a49..699400b9 100644 Binary files a/pokemon-gen8/shiny/marowak.png and b/pokemon-gen8/shiny/marowak.png differ diff --git a/pokemon-gen8/shiny/mienshao.png b/pokemon-gen8/shiny/mienshao.png index 95e519d0..6b9996dc 100644 Binary files a/pokemon-gen8/shiny/mienshao.png and b/pokemon-gen8/shiny/mienshao.png differ diff --git a/pokemon-gen8/shiny/miltank.png b/pokemon-gen8/shiny/miltank.png index c76b8fa9..4e8e9c06 100644 Binary files a/pokemon-gen8/shiny/miltank.png and b/pokemon-gen8/shiny/miltank.png differ diff --git a/pokemon-gen8/shiny/palossand.png b/pokemon-gen8/shiny/palossand.png index 225d5e86..cf7fe0f9 100644 Binary files a/pokemon-gen8/shiny/palossand.png and b/pokemon-gen8/shiny/palossand.png differ diff --git a/pokemon-gen8/shiny/pikachu-alola-cap.png b/pokemon-gen8/shiny/pikachu-alola-cap.png index dc71d526..392f096e 100644 Binary files a/pokemon-gen8/shiny/pikachu-alola-cap.png and b/pokemon-gen8/shiny/pikachu-alola-cap.png differ diff --git a/pokemon-gen8/shiny/pikachu-belle.png b/pokemon-gen8/shiny/pikachu-belle.png index 4d0449dd..a6bd2bb5 100644 Binary files a/pokemon-gen8/shiny/pikachu-belle.png and b/pokemon-gen8/shiny/pikachu-belle.png differ diff --git a/pokemon-gen8/shiny/pikachu-cosplay.png b/pokemon-gen8/shiny/pikachu-cosplay.png index fe0eb344..1e09f5a7 100644 Binary files a/pokemon-gen8/shiny/pikachu-cosplay.png and b/pokemon-gen8/shiny/pikachu-cosplay.png differ diff --git a/pokemon-gen8/shiny/pikachu-hoenn-cap.png b/pokemon-gen8/shiny/pikachu-hoenn-cap.png index 29bdc040..b2f9e452 100644 Binary files a/pokemon-gen8/shiny/pikachu-hoenn-cap.png and b/pokemon-gen8/shiny/pikachu-hoenn-cap.png differ diff --git a/pokemon-gen8/shiny/pikachu-kalos-cap.png b/pokemon-gen8/shiny/pikachu-kalos-cap.png index 100620b8..78ecf4bb 100644 Binary files a/pokemon-gen8/shiny/pikachu-kalos-cap.png and b/pokemon-gen8/shiny/pikachu-kalos-cap.png differ diff --git a/pokemon-gen8/shiny/pikachu-libre.png b/pokemon-gen8/shiny/pikachu-libre.png index 98dd6ab6..980f322f 100644 Binary files a/pokemon-gen8/shiny/pikachu-libre.png and b/pokemon-gen8/shiny/pikachu-libre.png differ diff --git a/pokemon-gen8/shiny/pikachu-original-cap.png b/pokemon-gen8/shiny/pikachu-original-cap.png index adba5b72..7d6f53dd 100644 Binary files a/pokemon-gen8/shiny/pikachu-original-cap.png and b/pokemon-gen8/shiny/pikachu-original-cap.png differ diff --git a/pokemon-gen8/shiny/pikachu-partner-cap.png b/pokemon-gen8/shiny/pikachu-partner-cap.png index 8ef25888..2a4df0f7 100644 Binary files a/pokemon-gen8/shiny/pikachu-partner-cap.png and b/pokemon-gen8/shiny/pikachu-partner-cap.png differ diff --git a/pokemon-gen8/shiny/pikachu-phd.png b/pokemon-gen8/shiny/pikachu-phd.png index ad57551a..dd1438c3 100644 Binary files a/pokemon-gen8/shiny/pikachu-phd.png and b/pokemon-gen8/shiny/pikachu-phd.png differ diff --git a/pokemon-gen8/shiny/pikachu-pop-star.png b/pokemon-gen8/shiny/pikachu-pop-star.png index 11e2c02e..81cc31dd 100644 Binary files a/pokemon-gen8/shiny/pikachu-pop-star.png and b/pokemon-gen8/shiny/pikachu-pop-star.png differ diff --git a/pokemon-gen8/shiny/pikachu-rock-star.png b/pokemon-gen8/shiny/pikachu-rock-star.png index 215d32fb..c54b0398 100644 Binary files a/pokemon-gen8/shiny/pikachu-rock-star.png and b/pokemon-gen8/shiny/pikachu-rock-star.png differ diff --git a/pokemon-gen8/shiny/pikachu-sinnoh-cap.png b/pokemon-gen8/shiny/pikachu-sinnoh-cap.png index 9d1df4ae..08707e52 100644 Binary files a/pokemon-gen8/shiny/pikachu-sinnoh-cap.png and b/pokemon-gen8/shiny/pikachu-sinnoh-cap.png differ diff --git a/pokemon-gen8/shiny/pikachu-starter.png b/pokemon-gen8/shiny/pikachu-starter.png index 476e0281..01b127e1 100644 Binary files a/pokemon-gen8/shiny/pikachu-starter.png and b/pokemon-gen8/shiny/pikachu-starter.png differ diff --git a/pokemon-gen8/shiny/pikachu-unova-cap.png b/pokemon-gen8/shiny/pikachu-unova-cap.png index 8938d1f6..1fba65a6 100644 Binary files a/pokemon-gen8/shiny/pikachu-unova-cap.png and b/pokemon-gen8/shiny/pikachu-unova-cap.png differ diff --git a/pokemon-gen8/shiny/pikachu-world-cap.png b/pokemon-gen8/shiny/pikachu-world-cap.png new file mode 100644 index 00000000..2928d44c Binary files /dev/null and b/pokemon-gen8/shiny/pikachu-world-cap.png differ diff --git a/pokemon-gen8/shiny/pikachu.png b/pokemon-gen8/shiny/pikachu.png index 5ba1dfc9..efa76059 100644 Binary files a/pokemon-gen8/shiny/pikachu.png and b/pokemon-gen8/shiny/pikachu.png differ diff --git a/pokemon-gen8/shiny/pinsir.png b/pokemon-gen8/shiny/pinsir.png index a92f7432..d72c1073 100644 Binary files a/pokemon-gen8/shiny/pinsir.png and b/pokemon-gen8/shiny/pinsir.png differ diff --git a/pokemon-gen8/shiny/politoed.png b/pokemon-gen8/shiny/politoed.png index 8822b162..7fe0e03b 100644 Binary files a/pokemon-gen8/shiny/politoed.png and b/pokemon-gen8/shiny/politoed.png differ diff --git a/pokemon-gen8/shiny/poliwrath.png b/pokemon-gen8/shiny/poliwrath.png index 3e9c6761..7f393e09 100644 Binary files a/pokemon-gen8/shiny/poliwrath.png and b/pokemon-gen8/shiny/poliwrath.png differ diff --git a/pokemon-gen8/shiny/porygon-z.png b/pokemon-gen8/shiny/porygon-z.png index b8427b9d..e5a09f9d 100644 Binary files a/pokemon-gen8/shiny/porygon-z.png and b/pokemon-gen8/shiny/porygon-z.png differ diff --git a/pokemon-gen8/shiny/porygon2.png b/pokemon-gen8/shiny/porygon2.png index f8c11545..e9b96a16 100644 Binary files a/pokemon-gen8/shiny/porygon2.png and b/pokemon-gen8/shiny/porygon2.png differ diff --git a/pokemon-gen8/shiny/rillaboom-gmax.png b/pokemon-gen8/shiny/rillaboom-gmax.png new file mode 100644 index 00000000..c09a873d Binary files /dev/null and b/pokemon-gen8/shiny/rillaboom-gmax.png differ diff --git a/pokemon-gen8/shiny/sandslash.png b/pokemon-gen8/shiny/sandslash.png index c5006e7d..360845be 100644 Binary files a/pokemon-gen8/shiny/sandslash.png and b/pokemon-gen8/shiny/sandslash.png differ diff --git a/pokemon-gen8/shiny/scizor.png b/pokemon-gen8/shiny/scizor.png index 8aac45bc..64ba0afa 100644 Binary files a/pokemon-gen8/shiny/scizor.png and b/pokemon-gen8/shiny/scizor.png differ diff --git a/pokemon-gen8/shiny/scolipede.png b/pokemon-gen8/shiny/scolipede.png index 04e764ff..956b13db 100644 Binary files a/pokemon-gen8/shiny/scolipede.png and b/pokemon-gen8/shiny/scolipede.png differ diff --git a/pokemon-gen8/shiny/scyther.png b/pokemon-gen8/shiny/scyther.png index 6420c137..7565386e 100644 Binary files a/pokemon-gen8/shiny/scyther.png and b/pokemon-gen8/shiny/scyther.png differ diff --git a/pokemon-gen8/shiny/sharpedo.png b/pokemon-gen8/shiny/sharpedo.png index 632dfb9d..0ca66769 100644 Binary files a/pokemon-gen8/shiny/sharpedo.png and b/pokemon-gen8/shiny/sharpedo.png differ diff --git a/pokemon-gen8/shiny/skarmory.png b/pokemon-gen8/shiny/skarmory.png index b0f94802..30f397a7 100644 Binary files a/pokemon-gen8/shiny/skarmory.png and b/pokemon-gen8/shiny/skarmory.png differ diff --git a/pokemon-gen8/shiny/slowbro-galar.png b/pokemon-gen8/shiny/slowbro-galar.png new file mode 100644 index 00000000..c96c4b8e Binary files /dev/null and b/pokemon-gen8/shiny/slowbro-galar.png differ diff --git a/pokemon-gen8/shiny/slowbro.png b/pokemon-gen8/shiny/slowbro.png index 0a9543ee..421ffdc3 100644 Binary files a/pokemon-gen8/shiny/slowbro.png and b/pokemon-gen8/shiny/slowbro.png differ diff --git a/pokemon-gen8/shiny/slowking.png b/pokemon-gen8/shiny/slowking.png index 430c8ac3..4289a613 100644 Binary files a/pokemon-gen8/shiny/slowking.png and b/pokemon-gen8/shiny/slowking.png differ diff --git a/pokemon-gen8/shiny/starmie.png b/pokemon-gen8/shiny/starmie.png index dc08e855..7501e034 100644 Binary files a/pokemon-gen8/shiny/starmie.png and b/pokemon-gen8/shiny/starmie.png differ diff --git a/pokemon-gen8/shiny/stoutland.png b/pokemon-gen8/shiny/stoutland.png index 8d575aba..c87e1f2d 100644 Binary files a/pokemon-gen8/shiny/stoutland.png and b/pokemon-gen8/shiny/stoutland.png differ diff --git a/pokemon-gen8/shiny/talonflame.png b/pokemon-gen8/shiny/talonflame.png index e07ef074..7ac66638 100644 Binary files a/pokemon-gen8/shiny/talonflame.png and b/pokemon-gen8/shiny/talonflame.png differ diff --git a/pokemon-gen8/shiny/tangrowth.png b/pokemon-gen8/shiny/tangrowth.png index 72758090..0588204f 100644 Binary files a/pokemon-gen8/shiny/tangrowth.png and b/pokemon-gen8/shiny/tangrowth.png differ diff --git a/pokemon-gen8/shiny/tauros.png b/pokemon-gen8/shiny/tauros.png index f5bbe49d..eb5ed7c3 100644 Binary files a/pokemon-gen8/shiny/tauros.png and b/pokemon-gen8/shiny/tauros.png differ diff --git a/pokemon-gen8/shiny/tentacruel.png b/pokemon-gen8/shiny/tentacruel.png index 505c8070..48403a81 100644 Binary files a/pokemon-gen8/shiny/tentacruel.png and b/pokemon-gen8/shiny/tentacruel.png differ diff --git a/pokemon-gen8/shiny/tyranitar.png b/pokemon-gen8/shiny/tyranitar.png index a84b2c11..47cb62b9 100644 Binary files a/pokemon-gen8/shiny/tyranitar.png and b/pokemon-gen8/shiny/tyranitar.png differ diff --git a/pokemon-gen8/shiny/urshifu-gmax.png b/pokemon-gen8/shiny/urshifu-gmax.png new file mode 100644 index 00000000..c35f6a2b Binary files /dev/null and b/pokemon-gen8/shiny/urshifu-gmax.png differ diff --git a/pokemon-gen8/shiny/urshifu-rapid-strike-gmax.png b/pokemon-gen8/shiny/urshifu-rapid-strike-gmax.png new file mode 100644 index 00000000..c7b6fb84 Binary files /dev/null and b/pokemon-gen8/shiny/urshifu-rapid-strike-gmax.png differ diff --git a/pokemon-gen8/shiny/urshifu.png b/pokemon-gen8/shiny/urshifu.png new file mode 100644 index 00000000..145cc29f Binary files /dev/null and b/pokemon-gen8/shiny/urshifu.png differ diff --git a/pokemon-gen8/shiny/venusaur-gmax.png b/pokemon-gen8/shiny/venusaur-gmax.png new file mode 100644 index 00000000..56b93e64 Binary files /dev/null and b/pokemon-gen8/shiny/venusaur-gmax.png differ diff --git a/pokemon-gen8/shiny/venusaur.png b/pokemon-gen8/shiny/venusaur.png index a6431572..d8cbc153 100644 Binary files a/pokemon-gen8/shiny/venusaur.png and b/pokemon-gen8/shiny/venusaur.png differ diff --git a/pokemon-gen8/shiny/volcarona.png b/pokemon-gen8/shiny/volcarona.png index 9930a069..4a22a953 100644 Binary files a/pokemon-gen8/shiny/volcarona.png and b/pokemon-gen8/shiny/volcarona.png differ diff --git a/pokemon-gen8/shiny/wigglytuff.png b/pokemon-gen8/shiny/wigglytuff.png index 7351dfb4..794a9933 100644 Binary files a/pokemon-gen8/shiny/wigglytuff.png and b/pokemon-gen8/shiny/wigglytuff.png differ diff --git a/pokemon-gen8/shiny/zarude-dada.png b/pokemon-gen8/shiny/zarude-dada.png new file mode 100644 index 00000000..1a0a9f53 Binary files /dev/null and b/pokemon-gen8/shiny/zarude-dada.png differ diff --git a/pokemon-gen8/shiny/zarude.png b/pokemon-gen8/shiny/zarude.png new file mode 100644 index 00000000..5612caf0 Binary files /dev/null and b/pokemon-gen8/shiny/zarude.png differ diff --git a/pokemon-gen8/shiny/zoroark.png b/pokemon-gen8/shiny/zoroark.png index bf724908..a1c2eb1a 100644 Binary files a/pokemon-gen8/shiny/zoroark.png and b/pokemon-gen8/shiny/zoroark.png differ diff --git a/readme.md b/readme.md index 69cf2544..1b73574d 100644 --- a/readme.md +++ b/readme.md @@ -12,7 +12,7 @@ These sprites can be used as individual files, or accessed programmatically usin ## Sprites and metadata -This project contains both Pokémon box sprites and item sprites. For Pokémon, both the old style sprites from *Pokémon Sun/Moon* (Gen 7) and the new style sprites from *Pokémon Sword/Shield* (Gen 8) are included. Item sprites are available with Gen 8 style white outlines and without. +This project contains both Pokémon box sprites and item sprites. For Pokémon, both the old style sprites from *Pokémon Sun/Moon* (Gen 7) and the new style sprites from *Pokémon Sword/Shield* (Gen 8), including the DLC, are included. Item sprites are available with Gen 8 style white outlines and without. | Directory | Example | Size | Type | Description | |:----------|:-------:|:----------|:-----|:------------| @@ -30,7 +30,7 @@ See the [Pokémon sprite overview page](https://msikma.github.io/pokesprite/over ## Data files -Developers who want to use these sprites programmatically might want to look at the `/data/dex.json` and `/data/items.json` files; the former contains a list of all Pokémon and their associated sprites, and the latter links all sprites in the repo to their internal IDs used in-game. +Developers who want to use these sprites programmatically might want to look at the `/data/pokemon.json` and `/data/item-map.json` files; the former contains a list of all Pokémon and their associated sprites, and the latter links all sprites in the repo to their internal IDs used in-game. ### Pokémon sprite list @@ -97,7 +97,8 @@ The **`forms`** object contains a list of all sprites pertaining to a Pokémon. | `is_unofficial_legacy_icon` | As above, but only for the smaller legacy 40×30 sprites (only used for *Melmetal*) | | `is_prev_gen_icon` | This sprite is actually from an earlier generation | | `has_right` | A unique right-facing sprite is available (e.g. *Roselia*—only for Gen 7 Pokémon) | -| `has_female` | A unique female sprite is available (e.g. *Unfezant*) | +| `has_female` | This Pokémon has visible gender differences (e.g. *Unfezant*) | +| `has_unofficial_female_icon` | The female version of this Pokémon's sprite was custom made (e.g. *Pikachu*) | †: only applies to non-shiny sprites, as shiny sprites are always unofficial. @@ -121,7 +122,11 @@ For all other sprites that are neither Pokémon nor inventory items, see [`/data Since Gen 8, the Pokémon box sprites have become 68×56 (up from 40×30 in Gen 7) to accommodate larger sprite designs. - +

+ +    + +

Most Pokémon did not get a new sprite as of Gen 8, meaning their old sprite was padded to the new size. Sprites were padded from below, with one extra pixel of space on the bottom (see left). diff --git a/resources/images/readme_gen8_size.png b/resources/images/readme_gen8_size.png deleted file mode 100644 index 5af22fd6..00000000 Binary files a/resources/images/readme_gen8_size.png and /dev/null differ diff --git a/resources/images/readme_gen8_size_1.png b/resources/images/readme_gen8_size_1.png new file mode 100644 index 00000000..eafec4f7 Binary files /dev/null and b/resources/images/readme_gen8_size_1.png differ diff --git a/resources/images/readme_gen8_size_2.png b/resources/images/readme_gen8_size_2.png new file mode 100644 index 00000000..92cddf08 Binary files /dev/null and b/resources/images/readme_gen8_size_2.png differ diff --git a/scripts/gen_docs.py b/scripts/gen_docs.py index 63e20da4..d2aced6a 100755 --- a/scripts/gen_docs.py +++ b/scripts/gen_docs.py @@ -42,6 +42,13 @@ EMPTY_PLACEHOLDER = '–' # Global sprite counter for the leftmost column _n_counter = None +def flatten(items, seqtypes=(list, tuple)): + '''Flattens a list.''' + for i, x in enumerate(items): + while i < len(items) and isinstance(items[i], seqtypes): + items[i:i+1] = items[i] + return items + def generate_index_page(version, commit): '''Generates the index page''' old_links = [ @@ -62,7 +69,7 @@ def generate_index_page(version, commit):

See the project page on Github for more information.

Legacy images

-

As of Feb 2020, this project is up-to-date with Gen 8 (Pokémon Sword/Shield). All old images from Gen 7 (Pokémon Ultra Sun/Ultra Moon) are still available for legacy support.

+

As of Feb 2020, this project is up-to-date with Gen 8 (Pokémon Sword/Shield and its DLC). All old images from Gen 7 (Pokémon Ultra Sun/Ultra Moon) are still available for legacy support.

Archived versions of the legacy overview pages: