From 2c33a1f3a3299f80e5bf4deda39b923aa29e3182 Mon Sep 17 00:00:00 2001
From: Michiel Sikma <michiel@sikma.org>
Date: Wed, 19 Aug 2020 19:09:27 +0200
Subject: [PATCH 1/2] Change format of 'resolution' item - include target size
 + margin; pad gigantamax icon to allow it to display @2x

---
 data/misc.json                             | 644 ++++++++++-----------
 misc/special-attribute/gigantamax-icon.png | Bin 2055 -> 2068 bytes
 2 files changed, 322 insertions(+), 322 deletions(-)

diff --git a/data/misc.json b/data/misc.json
index 94e97c898..7b09f7348 100644
--- a/data/misc.json
+++ b/data/misc.json
@@ -15,7 +15,7 @@
         "gen-4": "ribbon/ability-ribbon.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -34,8 +34,8 @@
         "gen-8": "ribbon/gen8/alert-ribbon.png"
       },
       "resolution": {
-        "gen-4": "1x",
-        "gen-8": "2x"
+        "gen-4": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -54,8 +54,8 @@
         "gen-8": "ribbon/gen8/alola-champion-ribbon.png"
       },
       "resolution": {
-        "gen-7": "1x",
-        "gen-8": "2x"
+        "gen-7": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -74,8 +74,8 @@
         "gen-8": "ribbon/gen8/artist-ribbon.png"
       },
       "resolution": {
-        "gen-3": "1x",
-        "gen-8": "2x"
+        "gen-3": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -94,8 +94,8 @@
         "gen-8": "ribbon/gen8/battle-champion-ribbon.png"
       },
       "resolution": {
-        "gen-5": "1x",
-        "gen-8": "2x"
+        "gen-5": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -114,8 +114,8 @@
         "gen-8": "ribbon/gen8/battle-memory-ribbon.png"
       },
       "resolution": {
-        "gen-6": "1x",
-        "gen-8": "2x"
+        "gen-6": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -133,7 +133,7 @@
         "gen-6": "ribbon/battle-memory-ribbon-gold.png"
       },
       "resolution": {
-        "gen-6": "1x"
+        "gen-6": ["1x"]
       }
     },
     {
@@ -152,8 +152,8 @@
         "gen-8": "ribbon/gen8/battle-royal-master-ribbon.png"
       },
       "resolution": {
-        "gen-7": "1x",
-        "gen-8": "2x"
+        "gen-7": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -172,8 +172,8 @@
         "gen-8": "ribbon/gen8/battle-tree-great-ribbon.png"
       },
       "resolution": {
-        "gen-7": "1x",
-        "gen-8": "2x"
+        "gen-7": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -192,8 +192,8 @@
         "gen-8": "ribbon/gen8/battle-tree-master-ribbon.png"
       },
       "resolution": {
-        "gen-7": "1x",
-        "gen-8": "2x"
+        "gen-7": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -212,8 +212,8 @@
         "gen-8": "ribbon/gen8/beauty-master-ribbon.png"
       },
       "resolution": {
-        "gen-6": "1x",
-        "gen-8": "2x"
+        "gen-6": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -231,7 +231,7 @@
         "gen-3": "ribbon/beauty-ribbon-hoenn.png"
       },
       "resolution": {
-        "gen-3": "1x"
+        "gen-3": ["1x"]
       }
     },
     {
@@ -249,7 +249,7 @@
         "gen-4": "ribbon/beauty-ribbon-sinnoh.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -267,7 +267,7 @@
         "gen-4": "ribbon/beauty-ribbon-great-sinnoh.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -285,7 +285,7 @@
         "gen-3": "ribbon/beauty-ribbon-hyper-hoenn.png"
       },
       "resolution": {
-        "gen-3": "1x"
+        "gen-3": ["1x"]
       }
     },
     {
@@ -303,7 +303,7 @@
         "gen-3": "ribbon/beauty-ribbon-master-hoenn.png"
       },
       "resolution": {
-        "gen-3": "1x"
+        "gen-3": ["1x"]
       }
     },
     {
@@ -321,7 +321,7 @@
         "gen-4": "ribbon/beauty-ribbon-master-sinnoh.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -339,7 +339,7 @@
         "gen-3": "ribbon/beauty-ribbon-super-hoenn.png"
       },
       "resolution": {
-        "gen-3": "1x"
+        "gen-3": ["1x"]
       }
     },
     {
@@ -357,7 +357,7 @@
         "gen-4": "ribbon/beauty-ribbon-ultra-sinnoh.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -376,8 +376,8 @@
         "gen-8": "ribbon/gen8/best-friends-ribbon.png"
       },
       "resolution": {
-        "gen-6": "1x",
-        "gen-8": "2x"
+        "gen-6": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -396,8 +396,8 @@
         "gen-8": "ribbon/gen8/birthday-ribbon.png"
       },
       "resolution": {
-        "gen-5": "1x",
-        "gen-8": "2x"
+        "gen-5": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -415,7 +415,7 @@
         "gen-4": "ribbon/blue-ribbon.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -434,8 +434,8 @@
         "gen-8": "ribbon/gen8/careless-ribbon.png"
       },
       "resolution": {
-        "gen-4": "1x",
-        "gen-8": "2x"
+        "gen-4": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -453,7 +453,7 @@
         "gen-4": "ribbon/carnival-ribbon.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -472,8 +472,8 @@
         "gen-8": "ribbon/gen8/champion-ribbon.png"
       },
       "resolution": {
-        "gen-3": "1x",
-        "gen-8": "2x"
+        "gen-3": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -492,8 +492,8 @@
         "gen-8": "ribbon/gen8/classic-ribbon.png"
       },
       "resolution": {
-        "gen-4": "1x",
-        "gen-8": "2x"
+        "gen-4": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -512,8 +512,8 @@
         "gen-8": "ribbon/gen8/cleverness-master-ribbon.png"
       },
       "resolution": {
-        "gen-6": "1x",
-        "gen-8": "2x"
+        "gen-6": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -532,8 +532,8 @@
         "gen-8": "ribbon/gen8/contest-memory-ribbon.png"
       },
       "resolution": {
-        "gen-6": "1x",
-        "gen-8": "2x"
+        "gen-6": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -551,7 +551,7 @@
         "gen-6": "ribbon/contest-memory-ribbon-gold.png"
       },
       "resolution": {
-        "gen-6": "1x"
+        "gen-6": ["1x"]
       }
     },
     {
@@ -570,8 +570,8 @@
         "gen-8": "ribbon/gen8/contest-star-ribbon.png"
       },
       "resolution": {
-        "gen-6": "1x",
-        "gen-8": "2x"
+        "gen-6": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -589,7 +589,7 @@
         "gen-3": "ribbon/cool-ribbon-hoenn.png"
       },
       "resolution": {
-        "gen-3": "1x"
+        "gen-3": ["1x"]
       }
     },
     {
@@ -607,7 +607,7 @@
         "gen-4": "ribbon/cool-ribbon-sinnoh.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -625,7 +625,7 @@
         "gen-4": "ribbon/cool-ribbon-great-sinnoh.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -643,7 +643,7 @@
         "gen-3": "ribbon/cool-ribbon-hyper-hoenn.png"
       },
       "resolution": {
-        "gen-3": "1x"
+        "gen-3": ["1x"]
       }
     },
     {
@@ -661,7 +661,7 @@
         "gen-3": "ribbon/cool-ribbon-master-hoenn.png"
       },
       "resolution": {
-        "gen-3": "1x"
+        "gen-3": ["1x"]
       }
     },
     {
@@ -679,7 +679,7 @@
         "gen-4": "ribbon/cool-ribbon-master-sinnoh.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -697,7 +697,7 @@
         "gen-3": "ribbon/cool-ribbon-super-hoenn.png"
       },
       "resolution": {
-        "gen-3": "1x"
+        "gen-3": ["1x"]
       }
     },
     {
@@ -715,7 +715,7 @@
         "gen-4": "ribbon/cool-ribbon-ultra-sinnoh.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -734,8 +734,8 @@
         "gen-8": "ribbon/gen8/coolness-master-ribbon.png"
       },
       "resolution": {
-        "gen-6": "1x",
-        "gen-8": "2x"
+        "gen-6": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -754,8 +754,8 @@
         "gen-8": "ribbon/gen8/country-ribbon.png"
       },
       "resolution": {
-        "gen-3": "1x",
-        "gen-8": "2x"
+        "gen-3": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -773,7 +773,7 @@
         "gen-3": "ribbon/cute-ribbon-hoenn.png"
       },
       "resolution": {
-        "gen-3": "1x"
+        "gen-3": ["1x"]
       }
     },
     {
@@ -791,7 +791,7 @@
         "gen-4": "ribbon/cute-ribbon-sinnoh.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -809,7 +809,7 @@
         "gen-4": "ribbon/cute-ribbon-great-sinnoh.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -827,7 +827,7 @@
         "gen-3": "ribbon/cute-ribbon-hyper-hoenn.png"
       },
       "resolution": {
-        "gen-3": "1x"
+        "gen-3": ["1x"]
       }
     },
     {
@@ -845,7 +845,7 @@
         "gen-3": "ribbon/cute-ribbon-master-hoenn.png"
       },
       "resolution": {
-        "gen-3": "1x"
+        "gen-3": ["1x"]
       }
     },
     {
@@ -863,7 +863,7 @@
         "gen-4": "ribbon/cute-ribbon-master-sinnoh.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -881,7 +881,7 @@
         "gen-3": "ribbon/cute-ribbon-super-hoenn.png"
       },
       "resolution": {
-        "gen-3": "1x"
+        "gen-3": ["1x"]
       }
     },
     {
@@ -899,7 +899,7 @@
         "gen-4": "ribbon/cute-ribbon-ultra-sinnoh.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -918,8 +918,8 @@
         "gen-8": "ribbon/gen8/cuteness-master-ribbon.png"
       },
       "resolution": {
-        "gen-6": "1x",
-        "gen-8": "2x"
+        "gen-6": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -937,7 +937,7 @@
         "gen-4": "ribbon/double-ability-ribbon.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -956,8 +956,8 @@
         "gen-8": "ribbon/gen8/downcast-ribbon.png"
       },
       "resolution": {
-        "gen-4": "1x",
-        "gen-8": "2x"
+        "gen-4": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -976,8 +976,8 @@
         "gen-8": "ribbon/gen8/earth-ribbon.png"
       },
       "resolution": {
-        "gen-3": "1x",
-        "gen-8": "2x"
+        "gen-3": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -996,8 +996,8 @@
         "gen-8": "ribbon/gen8/effort-ribbon.png"
       },
       "resolution": {
-        "gen-3": "1x",
-        "gen-8": "2x"
+        "gen-3": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -1016,8 +1016,8 @@
         "gen-8": "ribbon/gen8/event-ribbon.png"
       },
       "resolution": {
-        "gen-5": "1x",
-        "gen-8": "2x"
+        "gen-5": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -1036,8 +1036,8 @@
         "gen-8": "ribbon/gen8/expert-battler-ribbon.png"
       },
       "resolution": {
-        "gen-6": "1x",
-        "gen-8": "2x"
+        "gen-6": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -1055,7 +1055,7 @@
         "gen-4": "ribbon/festival-ribbon.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -1074,8 +1074,8 @@
         "gen-8": "ribbon/gen8/footprint-ribbon.png"
       },
       "resolution": {
-        "gen-4": "1x",
-        "gen-8": "2x"
+        "gen-4": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -1094,8 +1094,8 @@
         "gen-8": "ribbon/gen8/gorgeous-ribbon.png"
       },
       "resolution": {
-        "gen-4": "1x",
-        "gen-8": "2x"
+        "gen-4": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -1114,8 +1114,8 @@
         "gen-8": "ribbon/gen8/gorgeous-royal-ribbon.png"
       },
       "resolution": {
-        "gen-4": "1x",
-        "gen-8": "2x"
+        "gen-4": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -1133,7 +1133,7 @@
         "gen-4": "ribbon/great-ability-ribbon.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -1151,7 +1151,7 @@
         "gen-4": "ribbon/green-ribbon.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -1169,7 +1169,7 @@
         "gen-4": "ribbon/history-ribbon.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -1188,8 +1188,8 @@
         "gen-8": "ribbon/gen8/hoenn-champion-ribbon.png"
       },
       "resolution": {
-        "gen-6": "1x",
-        "gen-8": "2x"
+        "gen-6": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -1208,8 +1208,8 @@
         "gen-8": "ribbon/gen8/kalos-champion-ribbon.png"
       },
       "resolution": {
-        "gen-6": "1x",
-        "gen-8": "2x"
+        "gen-6": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -1227,7 +1227,7 @@
         "gen-3": "ribbon/land-ribbon.png"
       },
       "resolution": {
-        "gen-3": "1x"
+        "gen-3": ["1x"]
       }
     },
     {
@@ -1246,8 +1246,8 @@
         "gen-8": "ribbon/gen8/legend-ribbon.png"
       },
       "resolution": {
-        "gen-4": "1x",
-        "gen-8": "2x"
+        "gen-4": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -1265,7 +1265,7 @@
         "gen-3": "ribbon/marine-ribbon.png"
       },
       "resolution": {
-        "gen-3": "1x"
+        "gen-3": ["1x"]
       }
     },
     {
@@ -1283,7 +1283,7 @@
         "gen-4": "ribbon/multi-ability-ribbon.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -1302,8 +1302,8 @@
         "gen-8": "ribbon/gen8/national-champion-ribbon.png"
       },
       "resolution": {
-        "gen-5": "1x",
-        "gen-8": "2x"
+        "gen-5": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -1322,8 +1322,8 @@
         "gen-8": "ribbon/gen8/national-ribbon.png"
       },
       "resolution": {
-        "gen-3": "1x",
-        "gen-8": "2x"
+        "gen-3": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -1341,7 +1341,7 @@
         "gen-4": "ribbon/pair-ability-ribbon.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -1360,8 +1360,8 @@
         "gen-8": "ribbon/gen8/premier-ribbon.png"
       },
       "resolution": {
-        "gen-4": "1x",
-        "gen-8": "2x"
+        "gen-4": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -1380,8 +1380,8 @@
         "gen-8": "ribbon/gen8/record-ribbon.png"
       },
       "resolution": {
-        "gen-4": "1x",
-        "gen-8": "2x"
+        "gen-4": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -1399,7 +1399,7 @@
         "gen-4": "ribbon/red-ribbon.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -1418,8 +1418,8 @@
         "gen-8": "ribbon/gen8/regional-champion-ribbon.png"
       },
       "resolution": {
-        "gen-5": "1x",
-        "gen-8": "2x"
+        "gen-5": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -1438,8 +1438,8 @@
         "gen-8": "ribbon/gen8/relax-ribbon.png"
       },
       "resolution": {
-        "gen-4": "1x",
-        "gen-8": "2x"
+        "gen-4": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -1458,8 +1458,8 @@
         "gen-8": "ribbon/gen8/royal-ribbon.png"
       },
       "resolution": {
-        "gen-4": "1x",
-        "gen-8": "2x"
+        "gen-4": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -1478,8 +1478,8 @@
         "gen-8": "ribbon/gen8/shock-ribbon.png"
       },
       "resolution": {
-        "gen-4": "1x",
-        "gen-8": "2x"
+        "gen-4": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -1498,8 +1498,8 @@
         "gen-8": "ribbon/gen8/sinnoh-champion-ribbon.png"
       },
       "resolution": {
-        "gen-4": "1x",
-        "gen-8": "2x"
+        "gen-4": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -1518,8 +1518,8 @@
         "gen-8": "ribbon/gen8/skillful-battler-ribbon.png"
       },
       "resolution": {
-        "gen-6": "1x",
-        "gen-8": "2x"
+        "gen-6": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -1537,7 +1537,7 @@
         "gen-3": "ribbon/sky-ribbon.png"
       },
       "resolution": {
-        "gen-3": "1x"
+        "gen-3": ["1x"]
       }
     },
     {
@@ -1555,7 +1555,7 @@
         "gen-3": "ribbon/smart-ribbon-hoenn.png"
       },
       "resolution": {
-        "gen-3": "1x"
+        "gen-3": ["1x"]
       }
     },
     {
@@ -1573,7 +1573,7 @@
         "gen-4": "ribbon/smart-ribbon-sinnoh.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -1591,7 +1591,7 @@
         "gen-4": "ribbon/smart-ribbon-great-sinnoh.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -1609,7 +1609,7 @@
         "gen-3": "ribbon/smart-ribbon-hyper-hoenn.png"
       },
       "resolution": {
-        "gen-3": "1x"
+        "gen-3": ["1x"]
       }
     },
     {
@@ -1627,7 +1627,7 @@
         "gen-4": "ribbon/smart-ribbon-master-sinnoh.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -1645,7 +1645,7 @@
         "gen-3": "ribbon/smart-ribbon-master-hoenn.png"
       },
       "resolution": {
-        "gen-3": "1x"
+        "gen-3": ["1x"]
       }
     },
     {
@@ -1663,7 +1663,7 @@
         "gen-3": "ribbon/smart-ribbon-super-hoenn.png"
       },
       "resolution": {
-        "gen-3": "1x"
+        "gen-3": ["1x"]
       }
     },
     {
@@ -1681,7 +1681,7 @@
         "gen-4": "ribbon/smart-ribbon-ultra-sinnoh.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -1700,8 +1700,8 @@
         "gen-8": "ribbon/gen8/smile-ribbon.png"
       },
       "resolution": {
-        "gen-4": "1x",
-        "gen-8": "2x"
+        "gen-4": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -1720,8 +1720,8 @@
         "gen-8": "ribbon/gen8/snooze-ribbon.png"
       },
       "resolution": {
-        "gen-4": "1x",
-        "gen-8": "2x"
+        "gen-4": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -1740,8 +1740,8 @@
         "gen-8": "ribbon/gen8/souvenir-ribbon.png"
       },
       "resolution": {
-        "gen-5": "1x",
-        "gen-8": "2x"
+        "gen-5": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -1760,8 +1760,8 @@
         "gen-8": "ribbon/gen8/special-ribbon.png"
       },
       "resolution": {
-        "gen-5": "1x",
-        "gen-8": "2x"
+        "gen-5": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -1779,7 +1779,7 @@
         "gen-4": "ribbon/tough-ribbon-sinnoh.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -1797,7 +1797,7 @@
         "gen-3": "ribbon/tough-ribbon-hoenn.png"
       },
       "resolution": {
-        "gen-3": "1x"
+        "gen-3": ["1x"]
       }
     },
     {
@@ -1815,7 +1815,7 @@
         "gen-4": "ribbon/tough-ribbon-great-sinnoh.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -1833,7 +1833,7 @@
         "gen-3": "ribbon/tough-ribbon-hyper-hoenn.png"
       },
       "resolution": {
-        "gen-3": "1x"
+        "gen-3": ["1x"]
       }
     },
     {
@@ -1851,7 +1851,7 @@
         "gen-4": "ribbon/tough-ribbon-master-sinnoh.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -1869,7 +1869,7 @@
         "gen-3": "ribbon/tough-ribbon-master-hoenn.png"
       },
       "resolution": {
-        "gen-3": "1x"
+        "gen-3": ["1x"]
       }
     },
     {
@@ -1887,7 +1887,7 @@
         "gen-3": "ribbon/tough-ribbon-super-hoenn.png"
       },
       "resolution": {
-        "gen-3": "1x"
+        "gen-3": ["1x"]
       }
     },
     {
@@ -1905,7 +1905,7 @@
         "gen-4": "ribbon/tough-ribbon-ultra-sinnoh.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -1924,8 +1924,8 @@
         "gen-8": "ribbon/gen8/toughness-master-ribbon.png"
       },
       "resolution": {
-        "gen-6": "1x",
-        "gen-8": "2x"
+        "gen-6": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -1944,8 +1944,8 @@
         "gen-8": "ribbon/gen8/training-ribbon.png"
       },
       "resolution": {
-        "gen-6": "1x",
-        "gen-8": "2x"
+        "gen-6": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -1963,7 +1963,7 @@
         "gen-3": "ribbon/victory-ribbon.png"
       },
       "resolution": {
-        "gen-3": "1x"
+        "gen-3": ["1x"]
       }
     },
     {
@@ -1981,7 +1981,7 @@
         "gen-3": "ribbon/winning-ribbon.png"
       },
       "resolution": {
-        "gen-3": "1x"
+        "gen-3": ["1x"]
       }
     },
     {
@@ -2000,8 +2000,8 @@
         "gen-8": "ribbon/gen8/wishing-ribbon.png"
       },
       "resolution": {
-        "gen-5": "1x",
-        "gen-8": "2x"
+        "gen-5": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -2019,7 +2019,7 @@
         "gen-4": "ribbon/world-ability-ribbon.png"
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -2038,8 +2038,8 @@
         "gen-8": "ribbon/gen8/world-champion-ribbon.png"
       },
       "resolution": {
-        "gen-5": "1x",
-        "gen-8": "2x"
+        "gen-5": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -2058,8 +2058,8 @@
         "gen-8": "ribbon/gen8/world-ribbon.png"
       },
       "resolution": {
-        "gen-3": "1x",
-        "gen-8": "2x"
+        "gen-3": ["1x"],
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -2077,7 +2077,7 @@
         "gen-8": "ribbon/gen8/galar-champion-ribbon.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -2095,7 +2095,7 @@
         "gen-8": "ribbon/gen8/tower-master-ribbon.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+8x8"]
       }
     },
     {
@@ -2113,7 +2113,7 @@
         "gen-8": "ribbon/gen8/master-rank-ribbon.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+8x8"]
       }
     }
   ],
@@ -2129,8 +2129,8 @@
         "gen-8": "body-style/head-gen8.png"
       },
       "resolution": {
-        "gen-6": "1x",
-        "gen-8": "2x"
+        "gen-6": ["1x"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2144,8 +2144,8 @@
         "gen-8": "body-style/head-legs-gen8.png"
       },
       "resolution": {
-        "gen-6": "1x",
-        "gen-8": "2x"
+        "gen-6": ["1x"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2159,8 +2159,8 @@
         "gen-8": "body-style/fins-gen8.png"
       },
       "resolution": {
-        "gen-6": "1x",
-        "gen-8": "2x"
+        "gen-6": ["1x"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2174,8 +2174,8 @@
         "gen-8": "body-style/insectoid-gen8.png"
       },
       "resolution": {
-        "gen-6": "1x",
-        "gen-8": "2x"
+        "gen-6": ["1x"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2189,8 +2189,8 @@
         "gen-8": "body-style/quadruped-gen8.png"
       },
       "resolution": {
-        "gen-6": "1x",
-        "gen-8": "2x"
+        "gen-6": ["1x"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2204,8 +2204,8 @@
         "gen-8": "body-style/wings-multiple-gen8.png"
       },
       "resolution": {
-        "gen-6": "1x",
-        "gen-8": "2x"
+        "gen-6": ["1x"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2219,8 +2219,8 @@
         "gen-8": "body-style/multiple-gen8.png"
       },
       "resolution": {
-        "gen-6": "1x",
-        "gen-8": "2x"
+        "gen-6": ["1x"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2234,8 +2234,8 @@
         "gen-8": "body-style/tentacles-gen8.png"
       },
       "resolution": {
-        "gen-6": "1x",
-        "gen-8": "2x"
+        "gen-6": ["1x"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2249,8 +2249,8 @@
         "gen-8": "body-style/head-base-gen8.png"
       },
       "resolution": {
-        "gen-6": "1x",
-        "gen-8": "2x"
+        "gen-6": ["1x"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2264,8 +2264,8 @@
         "gen-8": "body-style/bipedal-tailed-gen8.png"
       },
       "resolution": {
-        "gen-6": "1x",
-        "gen-8": "2x"
+        "gen-6": ["1x"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2279,8 +2279,8 @@
         "gen-8": "body-style/bipedal-tailless-gen8.png"
       },
       "resolution": {
-        "gen-6": "1x",
-        "gen-8": "2x"
+        "gen-6": ["1x"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2294,8 +2294,8 @@
         "gen-8": "body-style/wings-single-gen8.png"
       },
       "resolution": {
-        "gen-6": "1x",
-        "gen-8": "2x"
+        "gen-6": ["1x"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2309,8 +2309,8 @@
         "gen-8": "body-style/serpentine-gen8.png"
       },
       "resolution": {
-        "gen-6": "1x",
-        "gen-8": "2x"
+        "gen-6": ["1x"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2324,8 +2324,8 @@
         "gen-8": "body-style/head-arms-gen8.png"
       },
       "resolution": {
-        "gen-6": "1x",
-        "gen-8": "2x"
+        "gen-6": ["1x"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     }
   ],
@@ -2351,7 +2351,7 @@
         "gen-8": "mark/lunchtime-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2375,7 +2375,7 @@
         "gen-8": "mark/sleepy-time-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2399,7 +2399,7 @@
         "gen-8": "mark/dusk-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2423,7 +2423,7 @@
         "gen-8": "mark/dawn-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2447,7 +2447,7 @@
         "gen-8": "mark/cloudy-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2471,7 +2471,7 @@
         "gen-8": "mark/rainy-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2495,7 +2495,7 @@
         "gen-8": "mark/stormy-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2519,7 +2519,7 @@
         "gen-8": "mark/snowy-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2543,7 +2543,7 @@
         "gen-8": "mark/blizzard-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2567,7 +2567,7 @@
         "gen-8": "mark/dry-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2591,7 +2591,7 @@
         "gen-8": "mark/sandstorm-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2615,7 +2615,7 @@
         "gen-8": "mark/misty-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2639,7 +2639,7 @@
         "gen-8": "mark/destiny-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2663,7 +2663,7 @@
         "gen-8": "mark/fishing-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2687,7 +2687,7 @@
         "gen-8": "mark/curry-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2711,7 +2711,7 @@
         "gen-8": "mark/rare-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2735,7 +2735,7 @@
         "gen-8": "mark/uncommon-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2759,7 +2759,7 @@
         "gen-8": "mark/rowdy-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2783,7 +2783,7 @@
         "gen-8": "mark/absent-minded-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2807,7 +2807,7 @@
         "gen-8": "mark/jittery-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2831,7 +2831,7 @@
         "gen-8": "mark/excited-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2855,7 +2855,7 @@
         "gen-8": "mark/charismatic-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2879,7 +2879,7 @@
         "gen-8": "mark/calmness-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2903,7 +2903,7 @@
         "gen-8": "mark/intense-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2927,7 +2927,7 @@
         "gen-8": "mark/zoned-out-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2951,7 +2951,7 @@
         "gen-8": "mark/joyful-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2975,7 +2975,7 @@
         "gen-8": "mark/angry-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -2999,7 +2999,7 @@
         "gen-8": "mark/smiley-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3023,7 +3023,7 @@
         "gen-8": "mark/teary-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3047,7 +3047,7 @@
         "gen-8": "mark/upbeat-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3071,7 +3071,7 @@
         "gen-8": "mark/peeved-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3095,7 +3095,7 @@
         "gen-8": "mark/intellectual-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3119,7 +3119,7 @@
         "gen-8": "mark/ferocious-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3143,7 +3143,7 @@
         "gen-8": "mark/crafty-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3167,7 +3167,7 @@
         "gen-8": "mark/scowling-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3191,7 +3191,7 @@
         "gen-8": "mark/kindly-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3215,7 +3215,7 @@
         "gen-8": "mark/flustered-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3239,7 +3239,7 @@
         "gen-8": "mark/pumped-up-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3263,7 +3263,7 @@
         "gen-8": "mark/zero-energy-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3287,7 +3287,7 @@
         "gen-8": "mark/prideful-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3311,7 +3311,7 @@
         "gen-8": "mark/unsure-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3335,7 +3335,7 @@
         "gen-8": "mark/humble-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3359,7 +3359,7 @@
         "gen-8": "mark/thorny-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3383,7 +3383,7 @@
         "gen-8": "mark/vigor-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3407,7 +3407,7 @@
         "gen-8": "mark/slump-mark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     }
   ],
@@ -3426,7 +3426,7 @@
         ]
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -3443,7 +3443,7 @@
         ]
       },
       "resolution": {
-        "gen-4": "1x"
+        "gen-4": ["1x"]
       }
     },
     {
@@ -3458,8 +3458,8 @@
         "gen-7": "special-attribute/mega-evolution-sigil.png"
       },
       "resolution": {
-        "gen-6": "1x",
-        "gen-7": "1x"
+        "gen-6": ["1x"],
+        "gen-7": ["1x"]
       }
     },
     {
@@ -3473,7 +3473,7 @@
         "gen-8": "special-attribute/mega-evolution-sigil-hires.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "14x14+0x0"]
       }
     },
     {
@@ -3487,7 +3487,7 @@
         "gen-8": "special-attribute/gigantamax-icon.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "15x12+0x0"]
       }
     }
   ],
@@ -3508,7 +3508,7 @@
         "gen-8": "type-logos/gen8/normal.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3527,7 +3527,7 @@
         "gen-8": "type-logos/gen8/fighting.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3546,7 +3546,7 @@
         "gen-8": "type-logos/gen8/flying.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3565,7 +3565,7 @@
         "gen-8": "type-logos/gen8/poison.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3584,7 +3584,7 @@
         "gen-8": "type-logos/gen8/ground.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3603,7 +3603,7 @@
         "gen-8": "type-logos/gen8/rock.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3622,7 +3622,7 @@
         "gen-8": "type-logos/gen8/bug.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3641,7 +3641,7 @@
         "gen-8": "type-logos/gen8/ghost.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3660,7 +3660,7 @@
         "gen-8": "type-logos/gen8/steel.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3679,7 +3679,7 @@
         "gen-8": "type-logos/gen8/fire.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3698,7 +3698,7 @@
         "gen-8": "type-logos/gen8/water.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3717,7 +3717,7 @@
         "gen-8": "type-logos/gen8/grass.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3736,7 +3736,7 @@
         "gen-8": "type-logos/gen8/electric.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3755,7 +3755,7 @@
         "gen-8": "type-logos/gen8/psychic.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3774,7 +3774,7 @@
         "gen-8": "type-logos/gen8/ice.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3793,7 +3793,7 @@
         "gen-8": "type-logos/gen8/dragon.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3812,7 +3812,7 @@
         "gen-8": "type-logos/gen8/dark.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3831,7 +3831,7 @@
         "gen-8": "type-logos/gen8/fairy.png"
       },
       "resolution": {
-        "gen-8": "2x"
+        "gen-8": ["2x", "32x32+0x0"]
       }
     }
   ],
@@ -3848,9 +3848,9 @@
         "gen-8": "types/gen8/normal.png"
       },
       "resolution": {
-        "go": "2x",
-        "masters": "2x",
-        "gen-8": "2x"
+        "go": ["2x", "32x32+0x0"],
+        "masters": ["2x", "32x32+0x0"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3865,9 +3865,9 @@
         "gen-8": "types/gen8/fighting.png"
       },
       "resolution": {
-        "go": "2x",
-        "masters": "2x",
-        "gen-8": "2x"
+        "go": ["2x", "32x32+0x0"],
+        "masters": ["2x", "32x32+0x0"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3882,9 +3882,9 @@
         "gen-8": "types/gen8/flying.png"
       },
       "resolution": {
-        "go": "2x",
-        "masters": "2x",
-        "gen-8": "2x"
+        "go": ["2x", "32x32+0x0"],
+        "masters": ["2x", "32x32+0x0"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3899,9 +3899,9 @@
         "gen-8": "types/gen8/poison.png"
       },
       "resolution": {
-        "go": "2x",
-        "masters": "2x",
-        "gen-8": "2x"
+        "go": ["2x", "32x32+0x0"],
+        "masters": ["2x", "32x32+0x0"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3916,9 +3916,9 @@
         "gen-8": "types/gen8/ground.png"
       },
       "resolution": {
-        "go": "2x",
-        "masters": "2x",
-        "gen-8": "2x"
+        "go": ["2x", "32x32+0x0"],
+        "masters": ["2x", "32x32+0x0"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3933,9 +3933,9 @@
         "gen-8": "types/gen8/rock.png"
       },
       "resolution": {
-        "go": "2x",
-        "masters": "2x",
-        "gen-8": "2x"
+        "go": ["2x", "32x32+0x0"],
+        "masters": ["2x", "32x32+0x0"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3950,9 +3950,9 @@
         "gen-8": "types/gen8/bug.png"
       },
       "resolution": {
-        "go": "2x",
-        "masters": "2x",
-        "gen-8": "2x"
+        "go": ["2x", "32x32+0x0"],
+        "masters": ["2x", "32x32+0x0"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3967,9 +3967,9 @@
         "gen-8": "types/gen8/ghost.png"
       },
       "resolution": {
-        "go": "2x",
-        "masters": "2x",
-        "gen-8": "2x"
+        "go": ["2x", "32x32+0x0"],
+        "masters": ["2x", "32x32+0x0"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -3984,9 +3984,9 @@
         "gen-8": "types/gen8/steel.png"
       },
       "resolution": {
-        "go": "2x",
-        "masters": "2x",
-        "gen-8": "2x"
+        "go": ["2x", "32x32+0x0"],
+        "masters": ["2x", "32x32+0x0"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -4001,9 +4001,9 @@
         "gen-8": "types/gen8/fire.png"
       },
       "resolution": {
-        "go": "2x",
-        "masters": "2x",
-        "gen-8": "2x"
+        "go": ["2x", "32x32+0x0"],
+        "masters": ["2x", "32x32+0x0"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -4018,9 +4018,9 @@
         "gen-8": "types/gen8/water.png"
       },
       "resolution": {
-        "go": "2x",
-        "masters": "2x",
-        "gen-8": "2x"
+        "go": ["2x", "32x32+0x0"],
+        "masters": ["2x", "32x32+0x0"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -4035,9 +4035,9 @@
         "gen-8": "types/gen8/grass.png"
       },
       "resolution": {
-        "go": "2x",
-        "masters": "2x",
-        "gen-8": "2x"
+        "go": ["2x", "32x32+0x0"],
+        "masters": ["2x", "32x32+0x0"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -4052,9 +4052,9 @@
         "gen-8": "types/gen8/electric.png"
       },
       "resolution": {
-        "go": "2x",
-        "masters": "2x",
-        "gen-8": "2x"
+        "go": ["2x", "32x32+0x0"],
+        "masters": ["2x", "32x32+0x0"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -4069,9 +4069,9 @@
         "gen-8": "types/gen8/psychic.png"
       },
       "resolution": {
-        "go": "2x",
-        "masters": "2x",
-        "gen-8": "2x"
+        "go": ["2x", "32x32+0x0"],
+        "masters": ["2x", "32x32+0x0"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -4086,9 +4086,9 @@
         "gen-8": "types/gen8/ice.png"
       },
       "resolution": {
-        "go": "2x",
-        "masters": "2x",
-        "gen-8": "2x"
+        "go": ["2x", "32x32+0x0"],
+        "masters": ["2x", "32x32+0x0"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -4103,9 +4103,9 @@
         "gen-8": "types/gen8/dragon.png"
       },
       "resolution": {
-        "go": "2x",
-        "masters": "2x",
-        "gen-8": "2x"
+        "go": ["2x", "32x32+0x0"],
+        "masters": ["2x", "32x32+0x0"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -4120,9 +4120,9 @@
         "gen-8": "types/gen8/dark.png"
       },
       "resolution": {
-        "go": "2x",
-        "masters": "2x",
-        "gen-8": "2x"
+        "go": ["2x", "32x32+0x0"],
+        "masters": ["2x", "32x32+0x0"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     },
     {
@@ -4137,9 +4137,9 @@
         "gen-8": "types/gen8/fairy.png"
       },
       "resolution": {
-        "go": "2x",
-        "masters": "2x",
-        "gen-8": "2x"
+        "go": ["2x", "32x32+0x0"],
+        "masters": ["2x", "32x32+0x0"],
+        "gen-8": ["2x", "32x32+0x0"]
       }
     }
   ],
@@ -4156,9 +4156,9 @@
         "gen-4": "seals/gen4/move-physical.png"
       },
       "resolution": {
-        "home": "3x",
-        "gen-8": "2x",
-        "gen-4": "1x"
+        "home": ["2x", "32x32+0x0"],
+        "gen-8": ["2x", "24x16+0x0"],
+        "gen-4": ["1x"]
       }
     },
     {
@@ -4173,9 +4173,9 @@
         "gen-4": "seals/gen4/move-special.png"
       },
       "resolution": {
-        "home": "3x",
-        "gen-8": "2x",
-        "gen-4": "1x"
+        "home": ["2x", "32x32+0x0"],
+        "gen-8": ["2x", "24x16+0x0"],
+        "gen-4": ["1x"]
       }
     },
     {
@@ -4190,9 +4190,9 @@
         "gen-4": "seals/gen4/move-status.png"
       },
       "resolution": {
-        "home": "3x",
-        "gen-8": "2x",
-        "gen-4": "1x"
+        "home": ["2x", "32x32+0x0"],
+        "gen-8": ["2x", "24x16+0x0"],
+        "gen-4": ["1x"]
       }
     }
   ]
diff --git a/misc/special-attribute/gigantamax-icon.png b/misc/special-attribute/gigantamax-icon.png
index 61b862df513ee66be197d933e1dfca49fbb10813..d72f242b27dad1810e8dd0304ea9d180d4db0c95 100644
GIT binary patch
literal 2068
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

delta 2054
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


From 8bc5fb4a87b3a91f2a5a78a602add0bd943b5131 Mon Sep 17 00:00:00 2001
From: Michiel Sikma <michiel@sikma.org>
Date: Wed, 19 Aug 2020 22:13:42 +0200
Subject: [PATCH 2/2] Make misc item size explicit

---
 docs/resources/pokesprite-docs.css |  9 -----
 scripts/gen_docs.py                | 65 ++++++++++++++++++++----------
 2 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/docs/resources/pokesprite-docs.css b/docs/resources/pokesprite-docs.css
index 4c8e758ca..32b3b40a3 100644
--- a/docs/resources/pokesprite-docs.css
+++ b/docs/resources/pokesprite-docs.css
@@ -208,13 +208,4 @@
 }
 .markdown-body .pokesprite tbody img.retina {
   image-rendering: auto;
-  width: 32px;
-  height: 32px;
-}
-.markdown-body .pokesprite tbody img.retina-ribbon-gen8 {
-  margin: 4px;
-}
-.markdown-body .pokesprite tbody img.retina-seal-2x {
-  width: 24px;
-  height: 16px;
 }
diff --git a/scripts/gen_docs.py b/scripts/gen_docs.py
index 1ceaf7a58..4a4a43768 100755
--- a/scripts/gen_docs.py
+++ b/scripts/gen_docs.py
@@ -172,7 +172,7 @@ def get_menu_links(curr_page):
   return ''.join(menu_links)
 
 def get_title_venusaur():
-  return get_img_node(get_pkm_url(DEX_SPRITE_DIR[8], 'venusaur', True, False, False), None, 'Shiny Venusaur', 'p')
+  return get_img_node(get_pkm_url(DEX_SPRITE_DIR[8], 'venusaur', True, False, False), None, 'Shiny Venusaur', 'p', '1x')
 
 def wrap_in_html(content, title, version, commit, res_dir = '.'):
   return '''
@@ -348,11 +348,31 @@ def get_td_node(td):
   attr = ' class="image"' if str(td)[:4] == '<img' else ''
   return f'<td{attr}>{td}</td>'
 
-def get_img_node(url, name, form_name, type, retina_type = None):
+def get_img_node_style(size = None, padding = None):
+  if size is None and padding is None:
+    return ''
+  segments = []
+  if size is not None:
+    segments.append(f'width: {size[0]}px')
+    segments.append(f'height: {size[1]}px')
+  if padding is not None and (padding[0] != '0' and padding[1] != '0'):
+    padding_h = int(padding[0]) / 2
+    padding_v = int(padding[1]) / 2
+    segments.append(f'padding-left: {padding_h}px')
+    segments.append(f'padding-right: {padding_h}px')
+    segments.append(f'padding-top: {padding_v}px')
+    segments.append(f'padding-bottom: {padding_v}px')
+  return f' style="{"; ".join(segments)}"'
+
+def get_img_node(url, name, form_name, type, retina_type = None, display_values = None):
+  display_size, display_padding = display_values.split('+') if display_values is not None else [None, None]
+  size = display_size.split('x') if display_size is not None else None
+  padding = display_padding.split('x') if display_padding is not None else None
+  style = get_img_node_style(size, padding)
   form_name = html.escape(form_name)
-  cls = [type, 'retina retina-' + retina_type if retina_type else '']
+  cls = [type, 'retina' if retina_type != '1x' else '']
   cls = ' '.join(cls).strip()
-  return f'<img class="{cls}" src="{url}" alt="{form_name}" />'
+  return f'<img class="{cls}" src="{url}" alt="{form_name}"{style} />'
 
 def get_gen_str(str):
   return str.capitalize() if 'gen-' not in str else ('Gen ' + str.split('-')[1])
@@ -389,8 +409,8 @@ def append_pkm(cols, base, slug_display, slug_file, form_name, form_alias, has_f
   '''Adds a single Pokémon row'''
   cols.append([
     get_counter(),
-    get_img_node(get_pkm_url(base, slug_file, False, is_female, is_right), None, form_name, 'p'),
-    get_img_node(get_pkm_url(base, slug_file, True, is_female, is_right), None, form_name, 'p'),
+    get_img_node(get_pkm_url(base, slug_file, False, is_female, is_right), None, form_name, 'p', '1x'),
+    get_img_node(get_pkm_url(base, slug_file, True, is_female, is_right), None, form_name, 'p', '1x'),
     [get_pkm_form(form_name, form_alias, is_unofficial_icon, is_female, has_unofficial_female_icon), get_pkm_gender(is_female, has_female), get_pkm_gen(is_prev_gen_icon, docs_gen)],
     f'<code>{slug_display}</code>'
   ])
@@ -452,10 +472,8 @@ def generate_misc_table(misc, meta, curr_page, json_file, version = '[unknown]',
         for v in vs:
           count = get_counter()
           gen_n = get_gen_str(k)
-          res = item['resolution'][k]
-          retina_type = \
-            'ribbon-gen8' if (res == '2x' and misc_set in ['ribbon', 'mark']) else \
-            None
+          res_type = item['resolution'][k]
+          res_vals = res_type[1] if len(res_type) > 1 else None
           buffer.append('<tr class="variable-height">')
           buffer.append(f'<td>{count}</td>')
           if row_n == 0:
@@ -464,7 +482,7 @@ def generate_misc_table(misc, meta, curr_page, json_file, version = '[unknown]',
             buffer.append(f'<td{rowspan}>{name_eng_desc}</td>')
             buffer.append(f'<td{rowspan}>{name_jpn}</td>')
             buffer.append(f'<td{rowspan}>Gen {origin_gen}</td>')
-          buffer.append('<td class="image item">' + get_img_node(get_misc_url(base_url, v), None, f"Sprite for '{name_eng}'", 'm', retina_type) + '</td>')
+          buffer.append('<td class="image item">' + get_img_node(get_misc_url(base_url, v), None, f"Sprite for '{name_eng}'", 'm', res_type[0], res_vals) + '</td>')
           buffer.append(f'<td class="filler{" last-item" if len(vs) > 1 and row_n > 0 else ""}"><code>{v}</code></td>')
           if len(vs) > 1:
             if gen_row_n == 0:
@@ -495,6 +513,8 @@ def generate_misc_table(misc, meta, curr_page, json_file, version = '[unknown]',
     for k, v in files:
       count = get_counter()
       gen_n = get_gen_str(k)
+      res_type = item['resolution'][k]
+      res_vals = res_type[1] if len(res_type) > 1 else None
       buffer.append('<tr class="variable-height">')
       buffer.append(f'<td>{count}</td>')
       if row_n == 0:
@@ -502,7 +522,7 @@ def generate_misc_table(misc, meta, curr_page, json_file, version = '[unknown]',
         rowspan = f' rowspan="{rows}"' if rows > 1 else ''
         buffer.append(f'<td{rowspan}>{name_eng.capitalize()}</td>')
         buffer.append(f'<td{rowspan} colspan="2">{name_jpn}</td>')
-      buffer.append('<td class="image item">' + get_img_node(get_misc_url(base_url, v), None, f"Sprite for '{name_eng}'", 'm', 'body-style-gen8') + '</td>')
+      buffer.append('<td class="image item">' + get_img_node(get_misc_url(base_url, v), None, f"Sprite for '{name_eng}'", 'm', res_type[0], res_vals) + '</td>')
       buffer.append(f'<td class="filler" colspan="1"><code>{v}</code></td>')
       buffer.append(f'<td>{gen_n}</td>')
       buffer.append('</tr>')
@@ -526,6 +546,8 @@ def generate_misc_table(misc, meta, curr_page, json_file, version = '[unknown]',
     for k, v in files:
       count = get_counter()
       gen_n = get_gen_str(k)
+      res_type = item['resolution'][k]
+      res_vals = res_type[1] if len(res_type) > 1 else None
       colors = item['colors'][k]
       main_color = colors[0]
       buffer.append('<tr class="variable-height">')
@@ -538,7 +560,7 @@ def generate_misc_table(misc, meta, curr_page, json_file, version = '[unknown]',
       
       buffer.append('<td class="image item type-icon-' + name_eng + '">' + \
         f'<style>tr:hover .type-icon-{name_eng} {{ background: {main_color} !important; }} tr:hover .type-icon-{name_eng} img {{ filter: brightness(100); }}</style>' + \
-        get_img_node(get_misc_url(base_url, v), None, f"Sprite for '{name_eng}'", 'm', 'body-style-gen8') + '</td>')
+        get_img_node(get_misc_url(base_url, v), None, f"Sprite for '{name_eng}'", 'm', res_type[0], res_vals) + '</td>')
       buffer.append(f'<td class="filler" colspan="1"><code>{v}</code></td>')
       buffer.append(f'<td>{gen_n}</td>')
       buffer.append('</tr>')
@@ -563,11 +585,8 @@ def generate_misc_table(misc, meta, curr_page, json_file, version = '[unknown]',
     for k, v in files:
       count = get_counter()
       gen_n = get_gen_str(k)
-      res = item['resolution'][k]
-      retina_type = \
-        'seal-3x' if res == '3x' else \
-        'seal-2x' if res == '2x' else \
-        None
+      res_type = item['resolution'][k]
+      res_vals = res_type[1] if len(res_type) > 1 else None
       buffer.append('<tr class="variable-height">')
       buffer.append(f'<td>{count}</td>')
       if row_n == 0:
@@ -575,7 +594,7 @@ def generate_misc_table(misc, meta, curr_page, json_file, version = '[unknown]',
         rowspan = f' rowspan="{rows}"' if rows > 1 else ''
         buffer.append(f'<td{rowspan}>{name_eng.capitalize()}</td>')
         buffer.append(f'<td{rowspan} colspan="2">{name_jpn}</td>')
-      buffer.append('<td class="image item">' + get_img_node(get_misc_url(base_url, v), None, f"Sprite for '{name_eng}'", 'm', retina_type) + '</td>')
+      buffer.append('<td class="image item">' + get_img_node(get_misc_url(base_url, v), None, f"Sprite for '{name_eng}'", 'm', res_type[0], res_vals) + '</td>')
       buffer.append(f'<td class="filler" colspan="1"><code>{v}</code></td>')
       buffer.append(f'<td>{gen_n}</td>')
       buffer.append('</tr>')
@@ -601,6 +620,8 @@ def generate_misc_table(misc, meta, curr_page, json_file, version = '[unknown]',
     for k, v in files:
       count = get_counter()
       gen_n = get_gen_str(k)
+      res_type = item['resolution'][k]
+      res_vals = res_type[1] if len(res_type) > 1 else None
       buffer.append('<tr class="variable-height">')
       buffer.append(f'<td>{count}</td>')
       if row_n == 0:
@@ -608,7 +629,7 @@ def generate_misc_table(misc, meta, curr_page, json_file, version = '[unknown]',
         rowspan = f' rowspan="{rows}"' if rows > 1 else ''
         buffer.append(f'<td{rowspan}>{name_eng}</td>')
         buffer.append(f'<td{rowspan} colspan="2">{name_jpn}</td>')
-      buffer.append('<td class="image item">' + get_img_node(get_misc_url(base_url, v), None, f"Sprite for '{name_eng}'", 'm', 'body-style-gen8' if k == 'gen-8' else '') + '</td>')
+      buffer.append('<td class="image item">' + get_img_node(get_misc_url(base_url, v), None, f"Sprite for '{name_eng}'", 'm', res_type[0], res_vals) + '</td>')
       buffer.append(f'<td class="filler" colspan="1"><code>{v}</code></td>')
       buffer.append(f'<td>{gen_n}</td>')
       buffer.append('</tr>')
@@ -681,7 +702,7 @@ def generate_items_table(itm, itm_unl, inv, etc, dirs, curr_page, json_file, ver
       name = item['name']
       id = item['id']
       expl = item.get('expl', False)
-      imgs = ['<td class="image item">' + get_img_node(get_itm_url(base_url, dir, group, name), None, f'"{name}" ({dir})', 'i') + '</td>' for dir in dirs]
+      imgs = ['<td class="image item">' + get_img_node(get_itm_url(base_url, dir, group, name), None, f'"{name}" ({dir})', 'i', '1x') + '</td>' for dir in dirs]
       filename = group + '/' + name + '.png'
       buffer.append('<tr>')
       buffer.append(f'<td>{count}</td>')
@@ -804,7 +825,7 @@ def generate_dex_table(dex, etc, gen, gen_dir, curr_page, json_file, add_female
       name_eng = item['name']['eng']
       name_jpn = item['name']['jpn']
       file = item['file']
-      img = get_img_node(get_etc_url(base_url, file), None, name_eng, 'p')
+      img = get_img_node(get_etc_url(base_url, file), None, name_eng, 'p', '1x')
       buffer.append(f'''
         <td>{count}</td>
         <td rowspan="1">{EMPTY_PLACEHOLDER}</td>