diff --git a/public/images/pokemon/icons/variant/2/167_2.png b/public/images/pokemon/icons/variant/2/167_2.png new file mode 100644 index 00000000000..a6bd15c0eef Binary files /dev/null and b/public/images/pokemon/icons/variant/2/167_2.png differ diff --git a/public/images/pokemon/icons/variant/2/168_2.png b/public/images/pokemon/icons/variant/2/168_2.png new file mode 100644 index 00000000000..cf34c26be21 Binary files /dev/null and b/public/images/pokemon/icons/variant/2/168_2.png differ diff --git a/public/images/pokemon_icons_2v.json b/public/images/pokemon_icons_2v.json index 359a99a8d45..23eec483b42 100644 --- a/public/images/pokemon_icons_2v.json +++ b/public/images/pokemon_icons_2v.json @@ -472,7 +472,7 @@ } }, { - "filename": "167_3", + "filename": "167_2", "rotated": false, "trimmed": false, "sourceSize": { @@ -492,6 +492,48 @@ "h": 30 } }, + { + "filename": "167_3", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 40, + "h": 30 + }, + "frame": { + "x": 400, + "y": 30, + "w": 40, + "h": 30 + } + }, + { + "filename": "168_2", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 40, + "h": 30 + }, + "frame": { + "x": 440, + "y": 30, + "w": 40, + "h": 30 + } + }, { "filename": "168_3", "rotated": false, @@ -507,7 +549,7 @@ "h": 30 }, "frame": { - "x": 400, + "x": 480, "y": 30, "w": 40, "h": 30 @@ -528,8 +570,8 @@ "h": 30 }, "frame": { - "x": 440, - "y": 30, + "x": 0, + "y": 60, "w": 40, "h": 30 } @@ -549,8 +591,8 @@ "h": 30 }, "frame": { - "x": 480, - "y": 30, + "x": 40, + "y": 60, "w": 40, "h": 30 } @@ -570,7 +612,7 @@ "h": 30 }, "frame": { - "x": 0, + "x": 80, "y": 60, "w": 40, "h": 30 @@ -591,7 +633,7 @@ "h": 30 }, "frame": { - "x": 40, + "x": 120, "y": 60, "w": 40, "h": 30 @@ -612,7 +654,7 @@ "h": 30 }, "frame": { - "x": 80, + "x": 160, "y": 60, "w": 40, "h": 30 @@ -633,7 +675,7 @@ "h": 30 }, "frame": { - "x": 120, + "x": 200, "y": 60, "w": 40, "h": 30 @@ -654,7 +696,7 @@ "h": 30 }, "frame": { - "x": 160, + "x": 240, "y": 60, "w": 40, "h": 30 @@ -675,7 +717,7 @@ "h": 30 }, "frame": { - "x": 200, + "x": 280, "y": 60, "w": 40, "h": 30 @@ -696,7 +738,7 @@ "h": 30 }, "frame": { - "x": 240, + "x": 320, "y": 60, "w": 40, "h": 30 @@ -717,7 +759,7 @@ "h": 30 }, "frame": { - "x": 280, + "x": 360, "y": 60, "w": 40, "h": 30 @@ -738,7 +780,7 @@ "h": 30 }, "frame": { - "x": 320, + "x": 400, "y": 60, "w": 40, "h": 30 @@ -759,7 +801,7 @@ "h": 30 }, "frame": { - "x": 360, + "x": 440, "y": 60, "w": 40, "h": 30 @@ -780,7 +822,7 @@ "h": 30 }, "frame": { - "x": 400, + "x": 480, "y": 60, "w": 40, "h": 30 @@ -801,8 +843,8 @@ "h": 30 }, "frame": { - "x": 440, - "y": 60, + "x": 0, + "y": 90, "w": 40, "h": 30 } @@ -822,8 +864,8 @@ "h": 30 }, "frame": { - "x": 480, - "y": 60, + "x": 40, + "y": 90, "w": 40, "h": 30 } @@ -843,7 +885,7 @@ "h": 30 }, "frame": { - "x": 0, + "x": 80, "y": 90, "w": 40, "h": 30 @@ -864,7 +906,7 @@ "h": 30 }, "frame": { - "x": 40, + "x": 120, "y": 90, "w": 40, "h": 30 @@ -885,7 +927,7 @@ "h": 30 }, "frame": { - "x": 80, + "x": 160, "y": 90, "w": 40, "h": 30 @@ -906,7 +948,7 @@ "h": 30 }, "frame": { - "x": 120, + "x": 200, "y": 90, "w": 40, "h": 30 @@ -927,7 +969,7 @@ "h": 30 }, "frame": { - "x": 160, + "x": 240, "y": 90, "w": 40, "h": 30 @@ -948,7 +990,7 @@ "h": 30 }, "frame": { - "x": 200, + "x": 280, "y": 90, "w": 40, "h": 30 @@ -969,7 +1011,7 @@ "h": 30 }, "frame": { - "x": 240, + "x": 320, "y": 90, "w": 40, "h": 30 @@ -990,7 +1032,7 @@ "h": 30 }, "frame": { - "x": 280, + "x": 360, "y": 90, "w": 40, "h": 30 @@ -1011,7 +1053,7 @@ "h": 30 }, "frame": { - "x": 320, + "x": 400, "y": 90, "w": 40, "h": 30 @@ -1032,7 +1074,7 @@ "h": 30 }, "frame": { - "x": 360, + "x": 440, "y": 90, "w": 40, "h": 30 @@ -1053,7 +1095,7 @@ "h": 30 }, "frame": { - "x": 400, + "x": 480, "y": 90, "w": 40, "h": 30 @@ -1074,8 +1116,8 @@ "h": 30 }, "frame": { - "x": 440, - "y": 90, + "x": 0, + "y": 120, "w": 40, "h": 30 } @@ -1095,8 +1137,8 @@ "h": 30 }, "frame": { - "x": 480, - "y": 90, + "x": 40, + "y": 120, "w": 40, "h": 30 } @@ -1116,7 +1158,7 @@ "h": 30 }, "frame": { - "x": 0, + "x": 80, "y": 120, "w": 40, "h": 30 @@ -1137,7 +1179,7 @@ "h": 30 }, "frame": { - "x": 40, + "x": 120, "y": 120, "w": 40, "h": 30 @@ -1158,7 +1200,7 @@ "h": 30 }, "frame": { - "x": 80, + "x": 160, "y": 120, "w": 40, "h": 30 @@ -1179,7 +1221,7 @@ "h": 30 }, "frame": { - "x": 120, + "x": 200, "y": 120, "w": 40, "h": 30 @@ -1200,7 +1242,7 @@ "h": 30 }, "frame": { - "x": 160, + "x": 240, "y": 120, "w": 40, "h": 30 @@ -1221,7 +1263,7 @@ "h": 30 }, "frame": { - "x": 200, + "x": 280, "y": 120, "w": 40, "h": 30 @@ -1242,7 +1284,7 @@ "h": 30 }, "frame": { - "x": 240, + "x": 320, "y": 120, "w": 40, "h": 30 @@ -1263,7 +1305,7 @@ "h": 30 }, "frame": { - "x": 280, + "x": 360, "y": 120, "w": 40, "h": 30 @@ -1284,7 +1326,7 @@ "h": 30 }, "frame": { - "x": 320, + "x": 400, "y": 120, "w": 40, "h": 30 @@ -1305,7 +1347,7 @@ "h": 30 }, "frame": { - "x": 360, + "x": 440, "y": 120, "w": 40, "h": 30 @@ -1326,7 +1368,7 @@ "h": 30 }, "frame": { - "x": 400, + "x": 480, "y": 120, "w": 40, "h": 30 @@ -1346,48 +1388,6 @@ "w": 40, "h": 30 }, - "frame": { - "x": 440, - "y": 120, - "w": 40, - "h": 30 - } - }, - { - "filename": "185_3", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 30 - }, - "frame": { - "x": 480, - "y": 120, - "w": 40, - "h": 30 - } - }, - { - "filename": "190_2", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 30 - }, "frame": { "x": 0, "y": 150, @@ -1396,7 +1396,7 @@ } }, { - "filename": "190_3", + "filename": "185_3", "rotated": false, "trimmed": false, "sourceSize": { @@ -1417,7 +1417,7 @@ } }, { - "filename": "193_2", + "filename": "190_2", "rotated": false, "trimmed": false, "sourceSize": { @@ -1438,7 +1438,7 @@ } }, { - "filename": "193_3", + "filename": "190_3", "rotated": false, "trimmed": false, "sourceSize": { @@ -1459,7 +1459,7 @@ } }, { - "filename": "194_2", + "filename": "193_2", "rotated": false, "trimmed": false, "sourceSize": { @@ -1480,7 +1480,7 @@ } }, { - "filename": "194_3", + "filename": "193_3", "rotated": false, "trimmed": false, "sourceSize": { @@ -1501,7 +1501,7 @@ } }, { - "filename": "195_2", + "filename": "194_2", "rotated": false, "trimmed": false, "sourceSize": { @@ -1522,7 +1522,7 @@ } }, { - "filename": "195_3", + "filename": "194_3", "rotated": false, "trimmed": false, "sourceSize": { @@ -1543,7 +1543,7 @@ } }, { - "filename": "196_1", + "filename": "195_2", "rotated": false, "trimmed": false, "sourceSize": { @@ -1564,7 +1564,7 @@ } }, { - "filename": "196_2", + "filename": "195_3", "rotated": false, "trimmed": false, "sourceSize": { @@ -1585,7 +1585,7 @@ } }, { - "filename": "196_3", + "filename": "196_1", "rotated": false, "trimmed": false, "sourceSize": { @@ -1606,7 +1606,7 @@ } }, { - "filename": "197_2", + "filename": "196_2", "rotated": false, "trimmed": false, "sourceSize": { @@ -1627,7 +1627,7 @@ } }, { - "filename": "197_3", + "filename": "196_3", "rotated": false, "trimmed": false, "sourceSize": { @@ -1648,7 +1648,7 @@ } }, { - "filename": "198-f_2", + "filename": "197_2", "rotated": false, "trimmed": false, "sourceSize": { @@ -1669,7 +1669,7 @@ } }, { - "filename": "198-f_3", + "filename": "197_3", "rotated": false, "trimmed": false, "sourceSize": { @@ -1689,6 +1689,27 @@ "h": 30 } }, + { + "filename": "198-f_2", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 40, + "h": 30 + }, + "frame": { + "x": 80, + "y": 180, + "w": 40, + "h": 30 + } + }, { "filename": "198_2", "rotated": false, @@ -1710,6 +1731,27 @@ "h": 30 } }, + { + "filename": "198-f_3", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 40, + "h": 30 + }, + "frame": { + "x": 120, + "y": 180, + "w": 40, + "h": 30 + } + }, { "filename": "198_3", "rotated": false, @@ -4593,6 +4635,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:ff54fa5126a17cec88b98f162597ce6f:99c19b3effadce83c903f5e2a68c7dce:63b368599cdc6e139499267117e91cd5$" + "smartupdate": "$TexturePacker:SmartUpdate:cb87bf48266ab3d893dbbd24a52f875f:d37e73561b49b4fe831e3fcaee67b851:63b368599cdc6e139499267117e91cd5$" } } diff --git a/public/images/pokemon_icons_2v.png b/public/images/pokemon_icons_2v.png index 8b3d0af3f3f..e74840b647b 100644 Binary files a/public/images/pokemon_icons_2v.png and b/public/images/pokemon_icons_2v.png differ