diff --git a/public/images/pokemon/554.png b/public/images/pokemon/554.png index d2483d4cec7..b0c4bb10335 100644 Binary files a/public/images/pokemon/554.png and b/public/images/pokemon/554.png differ diff --git a/public/images/pokemon/555-zen.png b/public/images/pokemon/555-zen.png index e94c779abce..48cbf58a17a 100644 Binary files a/public/images/pokemon/555-zen.png and b/public/images/pokemon/555-zen.png differ diff --git a/public/images/pokemon/555.png b/public/images/pokemon/555.png index 0843ef0026b..0ec02846a6a 100644 Binary files a/public/images/pokemon/555.png and b/public/images/pokemon/555.png differ diff --git a/public/images/pokemon/back/554.png b/public/images/pokemon/back/554.png index 4ed9c06f0ee..c98e9bdfd05 100644 Binary files a/public/images/pokemon/back/554.png and b/public/images/pokemon/back/554.png differ diff --git a/public/images/pokemon/back/555-zen.png b/public/images/pokemon/back/555-zen.png index 48ef6beb7c4..8fe0e672a3a 100644 Binary files a/public/images/pokemon/back/555-zen.png and b/public/images/pokemon/back/555-zen.png differ diff --git a/public/images/pokemon/back/555.png b/public/images/pokemon/back/555.png index 8f1a709c5f4..77c04139079 100644 Binary files a/public/images/pokemon/back/555.png and b/public/images/pokemon/back/555.png differ diff --git a/public/images/pokemon/icons/variant/5/554_2.png b/public/images/pokemon/icons/variant/5/554_2.png new file mode 100644 index 00000000000..8f5df20db65 Binary files /dev/null and b/public/images/pokemon/icons/variant/5/554_2.png differ diff --git a/public/images/pokemon/icons/variant/5/554_3.png b/public/images/pokemon/icons/variant/5/554_3.png new file mode 100644 index 00000000000..6827ee2b478 Binary files /dev/null and b/public/images/pokemon/icons/variant/5/554_3.png differ diff --git a/public/images/pokemon/icons/variant/5/555-zen_2.png b/public/images/pokemon/icons/variant/5/555-zen_2.png new file mode 100644 index 00000000000..ae18a833759 Binary files /dev/null and b/public/images/pokemon/icons/variant/5/555-zen_2.png differ diff --git a/public/images/pokemon/icons/variant/5/555-zen_3.png b/public/images/pokemon/icons/variant/5/555-zen_3.png new file mode 100644 index 00000000000..692e39985a6 Binary files /dev/null and b/public/images/pokemon/icons/variant/5/555-zen_3.png differ diff --git a/public/images/pokemon/icons/variant/5/555_2.png b/public/images/pokemon/icons/variant/5/555_2.png new file mode 100644 index 00000000000..f408122171a Binary files /dev/null and b/public/images/pokemon/icons/variant/5/555_2.png differ diff --git a/public/images/pokemon/icons/variant/5/555_3.png b/public/images/pokemon/icons/variant/5/555_3.png new file mode 100644 index 00000000000..2994d3da2cf Binary files /dev/null and b/public/images/pokemon/icons/variant/5/555_3.png differ diff --git a/public/images/pokemon/variant/554.json b/public/images/pokemon/variant/554.json new file mode 100644 index 00000000000..e68a01fefd5 --- /dev/null +++ b/public/images/pokemon/variant/554.json @@ -0,0 +1,36 @@ +{ + "1": { + "101010": "101010", + "3a2919": "", + "571515": "2e3573", + "5a1919": "a16012", + "634231": "b0895f", + "5a5a5a": "5a5a5a", + "9c2929": "4e5aa3", + "ce3131": "6c7ec4", + "947310": "bda373", + "ad5a29": "d19628", + "cea519": "cfc191", + "ffce21": "e3e2ba", + "ff9452": "e8c661", + "a5a5ad": "a5a5ad", + "ffffff": "ffffff" + }, + "2": { + "101010": "101010", + "3a2919": "3a2919", + "571515": "bf7558", + "5a1919": "291d1b", + "634231": "941c32", + "5a5a5a": "5a5a5a", + "9c2929": "d6a376", + "ce3131": "f0e2b9", + "947310": "9c1c2b", + "ad5a29": "4a3021", + "cea519": "ba343d", + "ffce21": "d14949", + "ff9452": "614b38", + "a5a5ad": "a5a5ad", + "ffffff": "ffffff" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/555-zen.json b/public/images/pokemon/variant/555-zen.json new file mode 100644 index 00000000000..da85df60fdb --- /dev/null +++ b/public/images/pokemon/variant/555-zen.json @@ -0,0 +1,32 @@ +{ + "1": { + "101010": "101010", + "215263": "592226", + "3a7b8c": "7d3e3d", + "425a63": "b5775b", + "4a4a52": "4a4a52", + "529cad": "8c5b54", + "7b5229": "3b3f87", + "7ba5bd": "c99d7b", + "9c9ca5": "9c9ca5", + "ad6b29": "5e65b5", + "b5d6ef": "e0c19b", + "e6a563": "7b8dd4", + "f7f7f7": "f7f7f7" + }, + "2": { + "101010": "101010", + "215263": "523273", + "3a7b8c": "805a9c", + "425a63": "2e2a51", + "4a4a52": "4a4a52", + "529cad": "a278b0", + "7b5229": "9e907e", + "7ba5bd": "494162", + "9c9ca5": "9c9ca5", + "ad6b29": "bab5a6", + "b5d6ef": "605375", + "e6a563": "f5f3e9", + "f7f7f7": "f7f7f7" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/555.json b/public/images/pokemon/variant/555.json new file mode 100644 index 00000000000..97d623f0d7d --- /dev/null +++ b/public/images/pokemon/variant/555.json @@ -0,0 +1,36 @@ +{ + "1": { + "101010": "101010", + "4a4a52": "4a4a52", + "523a21": "a65f33", + "631919": "222675", + "6b5a10": "b04a21", + "8c1929": "2d3685", + "8c8c9c": "8c8c9c", + "ad2119": "3a4c94", + "b57b4a": "d9a455", + "bd0000": "cfc191", + "bd9429": "c26932", + "ef1010": "e3e2ba", + "efa56b": "e8cd7b", + "efce10": "d9944a", + "f7f7f7": "f7f7f7" + }, + "2": { + "101010": "101010", + "4a4a52": "4a4a52", + "523a21": "291b19", + "631919": "a86722", + "6b5a10": "941c32", + "8c1929": "d6993e", + "8c8c9c": "8c8c9c", + "ad2119": "e8ca5d", + "b57b4a": "4a3021", + "bd0000": "bab5a6", + "bd9429": "ba343d", + "ef1010": "f5f3e9", + "efa56b": "614b38", + "efce10": "d14949", + "f7f7f7": "f7f7f7" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/_masterlist.json b/public/images/pokemon/variant/_masterlist.json index 549f9a1a48a..0aa48bc4b39 100644 --- a/public/images/pokemon/variant/_masterlist.json +++ b/public/images/pokemon/variant/_masterlist.json @@ -448,6 +448,9 @@ "551": [0, 1, 1], "552": [0, 1, 1], "553": [0, 1, 1], + "554": [0, 1, 1], + "555": [0, 1, 1], + "555-zen": [0, 1, 1], "556": [0, 1, 1], "559": [1, 1, 1], "560": [1, 1, 1], @@ -501,6 +504,7 @@ "621": [0, 1, 1], "622": [0, 1, 1], "623": [0, 1, 1], + "626": [0, 1, 1], "631": [0, 2, 2], "632": [0, 1, 1], "633": [0, 1, 1], @@ -1354,6 +1358,9 @@ "551": [0, 1, 1], "552": [0, 1, 1], "553": [0, 1, 1], + "554": [0, 1, 1], + "555": [0, 1, 1], + "555-zen": [0, 1, 1], "556": [0, 1, 1], "559": [1, 1, 1], "560": [1, 1, 1], @@ -1407,6 +1414,7 @@ "621": [0, 1, 1], "622": [0, 1, 1], "623": [0, 1, 1], + "626": [0, 1, 1], "631": [0, 2, 2], "632": [0, 1, 1], "633": [0, 1, 1], diff --git a/public/images/pokemon/variant/back/554.json b/public/images/pokemon/variant/back/554.json new file mode 100644 index 00000000000..4ae9e66d29f --- /dev/null +++ b/public/images/pokemon/variant/back/554.json @@ -0,0 +1,30 @@ +{ + "1": { + "101010": "101010", + "5a1919": "2e3573", + "591a1a": "a16012", + "634231": "946344", + "9c2929": "4e5aa3", + "ce3131": "6c7ec4", + "947310": "b0895f", + "ad5a29": "a17a50", + "ad5b2b": "d19628", + "cea519": "bda373", + "ffce21": "e3e2ba", + "ff9452": "e8c661" + }, + "2": { + "101010": "101010", + "5a1919": "bf7558", + "591a1a": "291d1b", + "634231": "75102a", + "9c2929": "d6a376", + "ce3131": "f0e2b9", + "947310": "9c1c2b", + "ad5a29": "", + "ad5b2b": "4a3021", + "cea519": "ba343d", + "ffce21": "d14949", + "ff9452": "614b38" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/back/555-zen.json b/public/images/pokemon/variant/back/555-zen.json new file mode 100644 index 00000000000..9df761c1833 --- /dev/null +++ b/public/images/pokemon/variant/back/555-zen.json @@ -0,0 +1,24 @@ +{ + "1": { + "101010": "101010", + "215263": "592226", + "3a7b8c": "7d3e3d", + "425a63": "b5775b", + "529cad": "8c5b54", + "7ba5bd": "c99d7b", + "ad6b29": "3b3f87", + "b5d6ef": "e0c19b", + "e6a563": "7b8dd4" + }, + "2": { + "101010": "101010", + "215263": "523273", + "3a7b8c": "805a9c", + "425a63": "2e2a51", + "529cad": "a278b0", + "7ba5bd": "494162", + "ad6b29": "9e907e", + "b5d6ef": "605375", + "e6a563": "f5f3e9" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/back/555.json b/public/images/pokemon/variant/back/555.json new file mode 100644 index 00000000000..b83ca9fb88b --- /dev/null +++ b/public/images/pokemon/variant/back/555.json @@ -0,0 +1,30 @@ +{ + "1": { + "101010": "101010", + "523a21": "a65f33", + "631919": "222675", + "6b5a10": "b04a21", + "8c1929": "2d3685", + "ad2119": "3a4c94", + "b57b4a": "d9a455", + "bd0000": "cfc191", + "bd9429": "c26932", + "ef1010": "e3e2ba", + "efa56b": "e8cd7b", + "efce10": "d9944a" + }, + "2": { + "101010": "101010", + "523a21": "291b19", + "631919": "a86722", + "6b5a10": "941c32", + "8c1929": "d6993e", + "ad2119": "e8ca5d", + "b57b4a": "4a3021", + "bd0000": "bab5a6", + "bd9429": "ba343d", + "ef1010": "f5f3e9", + "efa56b": "614b38", + "efce10": "d14949" + } +} \ No newline at end of file diff --git a/public/images/pokemon_icons_5v.json b/public/images/pokemon_icons_5v.json index f897285e314..de5c928c0f8 100644 --- a/public/images/pokemon_icons_5v.json +++ b/public/images/pokemon_icons_5v.json @@ -1543,7 +1543,7 @@ } }, { - "filename": "556_2", + "filename": "554_2", "rotated": false, "trimmed": false, "sourceSize": { @@ -1564,7 +1564,7 @@ } }, { - "filename": "556_3", + "filename": "554_3", "rotated": false, "trimmed": false, "sourceSize": { @@ -1585,7 +1585,7 @@ } }, { - "filename": "559_1", + "filename": "555-zen_2", "rotated": false, "trimmed": false, "sourceSize": { @@ -1606,7 +1606,7 @@ } }, { - "filename": "559_2", + "filename": "555-zen_3", "rotated": false, "trimmed": false, "sourceSize": { @@ -1627,7 +1627,7 @@ } }, { - "filename": "559_3", + "filename": "555_2", "rotated": false, "trimmed": false, "sourceSize": { @@ -1648,7 +1648,7 @@ } }, { - "filename": "560_1", + "filename": "555_3", "rotated": false, "trimmed": false, "sourceSize": { @@ -1668,6 +1668,132 @@ "h": 30 } }, + { + "filename": "556_2", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 40, + "h": 30 + }, + "frame": { + "x": 40, + "y": 180, + "w": 40, + "h": 30 + } + }, + { + "filename": "556_3", + "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": "559_1", + "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": "559_2", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 40, + "h": 30 + }, + "frame": { + "x": 160, + "y": 180, + "w": 40, + "h": 30 + } + }, + { + "filename": "559_3", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 40, + "h": 30 + }, + "frame": { + "x": 200, + "y": 180, + "w": 40, + "h": 30 + } + }, + { + "filename": "560_1", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 40, + "h": 30 + }, + "frame": { + "x": 240, + "y": 180, + "w": 40, + "h": 30 + } + }, { "filename": "560_2", "rotated": false, @@ -1683,7 +1809,7 @@ "h": 30 }, "frame": { - "x": 40, + "x": 280, "y": 180, "w": 40, "h": 30 @@ -1704,7 +1830,7 @@ "h": 30 }, "frame": { - "x": 80, + "x": 320, "y": 180, "w": 40, "h": 30 @@ -1725,7 +1851,7 @@ "h": 30 }, "frame": { - "x": 120, + "x": 360, "y": 180, "w": 40, "h": 30 @@ -1746,7 +1872,7 @@ "h": 30 }, "frame": { - "x": 160, + "x": 400, "y": 180, "w": 40, "h": 30 @@ -1767,7 +1893,7 @@ "h": 30 }, "frame": { - "x": 200, + "x": 440, "y": 180, "w": 40, "h": 30 @@ -1788,7 +1914,7 @@ "h": 30 }, "frame": { - "x": 240, + "x": 480, "y": 180, "w": 40, "h": 30 @@ -1809,8 +1935,8 @@ "h": 30 }, "frame": { - "x": 280, - "y": 180, + "x": 0, + "y": 210, "w": 40, "h": 30 } @@ -1830,8 +1956,8 @@ "h": 30 }, "frame": { - "x": 320, - "y": 180, + "x": 40, + "y": 210, "w": 40, "h": 30 } @@ -1851,8 +1977,8 @@ "h": 30 }, "frame": { - "x": 360, - "y": 180, + "x": 80, + "y": 210, "w": 40, "h": 30 } @@ -1872,8 +1998,8 @@ "h": 30 }, "frame": { - "x": 400, - "y": 180, + "x": 120, + "y": 210, "w": 40, "h": 30 } @@ -1893,8 +2019,8 @@ "h": 30 }, "frame": { - "x": 440, - "y": 180, + "x": 160, + "y": 210, "w": 40, "h": 30 } @@ -1914,8 +2040,8 @@ "h": 30 }, "frame": { - "x": 480, - "y": 180, + "x": 200, + "y": 210, "w": 40, "h": 30 } @@ -1935,7 +2061,7 @@ "h": 30 }, "frame": { - "x": 0, + "x": 240, "y": 210, "w": 40, "h": 30 @@ -1956,7 +2082,7 @@ "h": 30 }, "frame": { - "x": 40, + "x": 280, "y": 210, "w": 40, "h": 30 @@ -1977,7 +2103,7 @@ "h": 30 }, "frame": { - "x": 80, + "x": 320, "y": 210, "w": 40, "h": 30 @@ -1998,7 +2124,7 @@ "h": 30 }, "frame": { - "x": 120, + "x": 360, "y": 210, "w": 40, "h": 30 @@ -2019,7 +2145,7 @@ "h": 30 }, "frame": { - "x": 160, + "x": 400, "y": 210, "w": 40, "h": 30 @@ -2040,7 +2166,7 @@ "h": 30 }, "frame": { - "x": 200, + "x": 440, "y": 210, "w": 40, "h": 30 @@ -2061,7 +2187,7 @@ "h": 30 }, "frame": { - "x": 240, + "x": 480, "y": 210, "w": 40, "h": 30 @@ -2082,8 +2208,8 @@ "h": 30 }, "frame": { - "x": 280, - "y": 210, + "x": 0, + "y": 240, "w": 40, "h": 30 } @@ -2103,8 +2229,8 @@ "h": 30 }, "frame": { - "x": 320, - "y": 210, + "x": 40, + "y": 240, "w": 40, "h": 30 } @@ -2124,8 +2250,8 @@ "h": 30 }, "frame": { - "x": 360, - "y": 210, + "x": 80, + "y": 240, "w": 40, "h": 30 } @@ -2145,8 +2271,8 @@ "h": 30 }, "frame": { - "x": 400, - "y": 210, + "x": 120, + "y": 240, "w": 40, "h": 30 } @@ -2166,8 +2292,8 @@ "h": 30 }, "frame": { - "x": 440, - "y": 210, + "x": 160, + "y": 240, "w": 40, "h": 30 } @@ -2187,8 +2313,8 @@ "h": 30 }, "frame": { - "x": 480, - "y": 210, + "x": 200, + "y": 240, "w": 40, "h": 30 } @@ -2208,7 +2334,7 @@ "h": 30 }, "frame": { - "x": 0, + "x": 240, "y": 240, "w": 40, "h": 30 @@ -2229,7 +2355,7 @@ "h": 30 }, "frame": { - "x": 40, + "x": 280, "y": 240, "w": 40, "h": 30 @@ -2250,7 +2376,7 @@ "h": 30 }, "frame": { - "x": 80, + "x": 320, "y": 240, "w": 40, "h": 30 @@ -2271,7 +2397,7 @@ "h": 30 }, "frame": { - "x": 120, + "x": 360, "y": 240, "w": 40, "h": 30 @@ -2292,7 +2418,7 @@ "h": 30 }, "frame": { - "x": 160, + "x": 400, "y": 240, "w": 40, "h": 30 @@ -2313,7 +2439,7 @@ "h": 30 }, "frame": { - "x": 200, + "x": 440, "y": 240, "w": 40, "h": 30 @@ -2334,7 +2460,7 @@ "h": 30 }, "frame": { - "x": 240, + "x": 480, "y": 240, "w": 40, "h": 30 @@ -2355,8 +2481,8 @@ "h": 30 }, "frame": { - "x": 280, - "y": 240, + "x": 0, + "y": 270, "w": 40, "h": 30 } @@ -2376,8 +2502,8 @@ "h": 30 }, "frame": { - "x": 320, - "y": 240, + "x": 40, + "y": 270, "w": 40, "h": 30 } @@ -2397,8 +2523,8 @@ "h": 30 }, "frame": { - "x": 360, - "y": 240, + "x": 80, + "y": 270, "w": 40, "h": 30 } @@ -2418,8 +2544,8 @@ "h": 30 }, "frame": { - "x": 400, - "y": 240, + "x": 120, + "y": 270, "w": 40, "h": 30 } @@ -2439,8 +2565,8 @@ "h": 30 }, "frame": { - "x": 440, - "y": 240, + "x": 160, + "y": 270, "w": 40, "h": 30 } @@ -2460,8 +2586,8 @@ "h": 30 }, "frame": { - "x": 480, - "y": 240, + "x": 200, + "y": 270, "w": 40, "h": 30 } @@ -2481,7 +2607,7 @@ "h": 30 }, "frame": { - "x": 0, + "x": 240, "y": 270, "w": 40, "h": 30 @@ -2502,7 +2628,7 @@ "h": 30 }, "frame": { - "x": 40, + "x": 280, "y": 270, "w": 40, "h": 30 @@ -2523,7 +2649,7 @@ "h": 30 }, "frame": { - "x": 80, + "x": 320, "y": 270, "w": 40, "h": 30 @@ -2544,7 +2670,7 @@ "h": 30 }, "frame": { - "x": 120, + "x": 360, "y": 270, "w": 40, "h": 30 @@ -2565,7 +2691,7 @@ "h": 30 }, "frame": { - "x": 160, + "x": 400, "y": 270, "w": 40, "h": 30 @@ -2586,7 +2712,7 @@ "h": 30 }, "frame": { - "x": 200, + "x": 440, "y": 270, "w": 40, "h": 30 @@ -2607,7 +2733,7 @@ "h": 30 }, "frame": { - "x": 240, + "x": 480, "y": 270, "w": 40, "h": 30 @@ -2628,8 +2754,8 @@ "h": 30 }, "frame": { - "x": 280, - "y": 270, + "x": 0, + "y": 300, "w": 40, "h": 30 } @@ -2649,8 +2775,8 @@ "h": 30 }, "frame": { - "x": 320, - "y": 270, + "x": 40, + "y": 300, "w": 40, "h": 30 } @@ -2670,8 +2796,8 @@ "h": 30 }, "frame": { - "x": 360, - "y": 270, + "x": 80, + "y": 300, "w": 40, "h": 30 } @@ -2691,8 +2817,8 @@ "h": 30 }, "frame": { - "x": 400, - "y": 270, + "x": 120, + "y": 300, "w": 40, "h": 30 } @@ -2712,8 +2838,8 @@ "h": 30 }, "frame": { - "x": 440, - "y": 270, + "x": 160, + "y": 300, "w": 40, "h": 30 } @@ -2733,8 +2859,8 @@ "h": 30 }, "frame": { - "x": 480, - "y": 270, + "x": 200, + "y": 300, "w": 40, "h": 30 } @@ -2754,7 +2880,7 @@ "h": 30 }, "frame": { - "x": 0, + "x": 240, "y": 300, "w": 40, "h": 30 @@ -2775,7 +2901,7 @@ "h": 30 }, "frame": { - "x": 40, + "x": 280, "y": 300, "w": 40, "h": 30 @@ -2796,7 +2922,7 @@ "h": 30 }, "frame": { - "x": 80, + "x": 320, "y": 300, "w": 40, "h": 30 @@ -2817,7 +2943,7 @@ "h": 30 }, "frame": { - "x": 120, + "x": 360, "y": 300, "w": 40, "h": 30 @@ -2838,7 +2964,7 @@ "h": 30 }, "frame": { - "x": 160, + "x": 400, "y": 300, "w": 40, "h": 30 @@ -2859,7 +2985,7 @@ "h": 30 }, "frame": { - "x": 200, + "x": 440, "y": 300, "w": 40, "h": 30 @@ -2880,7 +3006,7 @@ "h": 30 }, "frame": { - "x": 240, + "x": 480, "y": 300, "w": 40, "h": 30 @@ -2901,8 +3027,8 @@ "h": 30 }, "frame": { - "x": 280, - "y": 300, + "x": 0, + "y": 330, "w": 40, "h": 30 } @@ -2922,8 +3048,8 @@ "h": 30 }, "frame": { - "x": 320, - "y": 300, + "x": 40, + "y": 330, "w": 40, "h": 30 } @@ -2943,8 +3069,8 @@ "h": 30 }, "frame": { - "x": 360, - "y": 300, + "x": 80, + "y": 330, "w": 40, "h": 30 } @@ -2964,8 +3090,8 @@ "h": 30 }, "frame": { - "x": 400, - "y": 300, + "x": 120, + "y": 330, "w": 40, "h": 30 } @@ -2985,8 +3111,8 @@ "h": 30 }, "frame": { - "x": 440, - "y": 300, + "x": 160, + "y": 330, "w": 40, "h": 30 } @@ -3006,8 +3132,8 @@ "h": 30 }, "frame": { - "x": 480, - "y": 300, + "x": 200, + "y": 330, "w": 40, "h": 30 } @@ -3027,7 +3153,7 @@ "h": 30 }, "frame": { - "x": 0, + "x": 240, "y": 330, "w": 40, "h": 30 @@ -3048,7 +3174,7 @@ "h": 30 }, "frame": { - "x": 40, + "x": 280, "y": 330, "w": 40, "h": 30 @@ -3069,7 +3195,7 @@ "h": 30 }, "frame": { - "x": 80, + "x": 320, "y": 330, "w": 40, "h": 30 @@ -3090,7 +3216,7 @@ "h": 30 }, "frame": { - "x": 120, + "x": 360, "y": 330, "w": 40, "h": 30 @@ -3111,7 +3237,7 @@ "h": 30 }, "frame": { - "x": 160, + "x": 400, "y": 330, "w": 40, "h": 30 @@ -3132,7 +3258,7 @@ "h": 30 }, "frame": { - "x": 200, + "x": 440, "y": 330, "w": 40, "h": 30 @@ -3153,7 +3279,7 @@ "h": 30 }, "frame": { - "x": 240, + "x": 480, "y": 330, "w": 40, "h": 30 @@ -3174,8 +3300,8 @@ "h": 30 }, "frame": { - "x": 280, - "y": 330, + "x": 0, + "y": 360, "w": 40, "h": 30 } @@ -3195,8 +3321,8 @@ "h": 30 }, "frame": { - "x": 320, - "y": 330, + "x": 40, + "y": 360, "w": 40, "h": 30 } @@ -3216,8 +3342,8 @@ "h": 30 }, "frame": { - "x": 360, - "y": 330, + "x": 80, + "y": 360, "w": 40, "h": 30 } @@ -3237,8 +3363,8 @@ "h": 30 }, "frame": { - "x": 400, - "y": 330, + "x": 120, + "y": 360, "w": 40, "h": 30 } @@ -3258,8 +3384,8 @@ "h": 30 }, "frame": { - "x": 440, - "y": 330, + "x": 160, + "y": 360, "w": 40, "h": 30 } @@ -3279,8 +3405,8 @@ "h": 30 }, "frame": { - "x": 480, - "y": 330, + "x": 200, + "y": 360, "w": 40, "h": 30 } @@ -3300,7 +3426,7 @@ "h": 30 }, "frame": { - "x": 0, + "x": 240, "y": 360, "w": 40, "h": 30 @@ -3321,7 +3447,7 @@ "h": 30 }, "frame": { - "x": 40, + "x": 280, "y": 360, "w": 40, "h": 30 @@ -3342,7 +3468,7 @@ "h": 30 }, "frame": { - "x": 80, + "x": 320, "y": 360, "w": 40, "h": 30 @@ -3363,7 +3489,7 @@ "h": 30 }, "frame": { - "x": 120, + "x": 360, "y": 360, "w": 40, "h": 30 @@ -3384,7 +3510,7 @@ "h": 30 }, "frame": { - "x": 160, + "x": 400, "y": 360, "w": 40, "h": 30 @@ -3405,7 +3531,7 @@ "h": 30 }, "frame": { - "x": 200, + "x": 440, "y": 360, "w": 40, "h": 30 @@ -3426,7 +3552,7 @@ "h": 30 }, "frame": { - "x": 240, + "x": 480, "y": 360, "w": 40, "h": 30 @@ -3447,8 +3573,8 @@ "h": 30 }, "frame": { - "x": 280, - "y": 360, + "x": 0, + "y": 390, "w": 40, "h": 30 } @@ -3468,8 +3594,8 @@ "h": 30 }, "frame": { - "x": 320, - "y": 360, + "x": 40, + "y": 390, "w": 40, "h": 30 } @@ -3489,8 +3615,8 @@ "h": 30 }, "frame": { - "x": 360, - "y": 360, + "x": 80, + "y": 390, "w": 40, "h": 30 } @@ -3510,8 +3636,8 @@ "h": 30 }, "frame": { - "x": 400, - "y": 360, + "x": 120, + "y": 390, "w": 40, "h": 30 } @@ -3531,8 +3657,8 @@ "h": 30 }, "frame": { - "x": 440, - "y": 360, + "x": 160, + "y": 390, "w": 40, "h": 30 } @@ -3552,8 +3678,8 @@ "h": 30 }, "frame": { - "x": 480, - "y": 360, + "x": 200, + "y": 390, "w": 40, "h": 30 } @@ -3573,7 +3699,7 @@ "h": 30 }, "frame": { - "x": 0, + "x": 240, "y": 390, "w": 40, "h": 30 @@ -3594,7 +3720,7 @@ "h": 30 }, "frame": { - "x": 40, + "x": 280, "y": 390, "w": 40, "h": 30 @@ -3615,7 +3741,7 @@ "h": 30 }, "frame": { - "x": 80, + "x": 320, "y": 390, "w": 40, "h": 30 @@ -3636,7 +3762,7 @@ "h": 30 }, "frame": { - "x": 120, + "x": 360, "y": 390, "w": 40, "h": 30 @@ -3657,7 +3783,7 @@ "h": 30 }, "frame": { - "x": 160, + "x": 400, "y": 390, "w": 40, "h": 30 @@ -3678,7 +3804,7 @@ "h": 30 }, "frame": { - "x": 200, + "x": 440, "y": 390, "w": 40, "h": 30 @@ -3699,7 +3825,7 @@ "h": 30 }, "frame": { - "x": 240, + "x": 480, "y": 390, "w": 40, "h": 30 @@ -3720,8 +3846,8 @@ "h": 30 }, "frame": { - "x": 280, - "y": 390, + "x": 0, + "y": 420, "w": 40, "h": 30 } @@ -3741,8 +3867,8 @@ "h": 30 }, "frame": { - "x": 320, - "y": 390, + "x": 40, + "y": 420, "w": 40, "h": 30 } @@ -3762,8 +3888,8 @@ "h": 30 }, "frame": { - "x": 360, - "y": 390, + "x": 80, + "y": 420, "w": 40, "h": 30 } @@ -3783,8 +3909,8 @@ "h": 30 }, "frame": { - "x": 400, - "y": 390, + "x": 120, + "y": 420, "w": 40, "h": 30 } @@ -3804,8 +3930,8 @@ "h": 30 }, "frame": { - "x": 440, - "y": 390, + "x": 160, + "y": 420, "w": 40, "h": 30 } @@ -3825,8 +3951,8 @@ "h": 30 }, "frame": { - "x": 480, - "y": 390, + "x": 200, + "y": 420, "w": 40, "h": 30 } @@ -3846,7 +3972,7 @@ "h": 30 }, "frame": { - "x": 0, + "x": 240, "y": 420, "w": 40, "h": 30 @@ -3867,12 +3993,54 @@ "h": 30 }, "frame": { - "x": 40, + "x": 280, "y": 420, "w": 40, "h": 30 } }, + { + "filename": "626_2", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 26, + "h": 21 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 26, + "h": 21 + }, + "frame": { + "x": 320, + "y": 420, + "w": 26, + "h": 21 + } + }, + { + "filename": "626_3", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 26, + "h": 21 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 26, + "h": 21 + }, + "frame": { + "x": 360, + "y": 420, + "w": 26, + "h": 21 + } + }, { "filename": "631_2", "rotated": false, @@ -3888,7 +4056,7 @@ "h": 30 }, "frame": { - "x": 80, + "x": 400, "y": 420, "w": 40, "h": 30 @@ -3909,7 +4077,7 @@ "h": 30 }, "frame": { - "x": 120, + "x": 440, "y": 420, "w": 40, "h": 30 @@ -3930,7 +4098,7 @@ "h": 30 }, "frame": { - "x": 160, + "x": 480, "y": 420, "w": 40, "h": 30 @@ -3951,8 +4119,8 @@ "h": 30 }, "frame": { - "x": 200, - "y": 420, + "x": 0, + "y": 450, "w": 40, "h": 30 } @@ -3972,8 +4140,8 @@ "h": 30 }, "frame": { - "x": 240, - "y": 420, + "x": 40, + "y": 450, "w": 40, "h": 30 } @@ -3993,8 +4161,8 @@ "h": 30 }, "frame": { - "x": 280, - "y": 420, + "x": 80, + "y": 450, "w": 40, "h": 30 } @@ -4014,8 +4182,8 @@ "h": 30 }, "frame": { - "x": 320, - "y": 420, + "x": 120, + "y": 450, "w": 40, "h": 30 } @@ -4035,8 +4203,8 @@ "h": 30 }, "frame": { - "x": 360, - "y": 420, + "x": 160, + "y": 450, "w": 40, "h": 30 } @@ -4056,8 +4224,8 @@ "h": 30 }, "frame": { - "x": 400, - "y": 420, + "x": 200, + "y": 450, "w": 40, "h": 30 } @@ -4077,8 +4245,8 @@ "h": 30 }, "frame": { - "x": 440, - "y": 420, + "x": 240, + "y": 450, "w": 40, "h": 30 } @@ -4098,8 +4266,8 @@ "h": 30 }, "frame": { - "x": 480, - "y": 420, + "x": 280, + "y": 450, "w": 40, "h": 30 } @@ -4119,7 +4287,7 @@ "h": 30 }, "frame": { - "x": 0, + "x": 320, "y": 450, "w": 40, "h": 30 @@ -4140,7 +4308,7 @@ "h": 30 }, "frame": { - "x": 40, + "x": 360, "y": 450, "w": 40, "h": 30 @@ -4161,7 +4329,7 @@ "h": 30 }, "frame": { - "x": 80, + "x": 400, "y": 450, "w": 40, "h": 30 @@ -4182,7 +4350,7 @@ "h": 30 }, "frame": { - "x": 120, + "x": 440, "y": 450, "w": 40, "h": 30 @@ -4203,133 +4371,7 @@ "h": 30 }, "frame": { - "x": 160, - "y": 450, - "w": 40, - "h": 30 - } - }, - { - "filename": "641-incarnate_1", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 30 - }, - "frame": { - "x": 200, - "y": 450, - "w": 40, - "h": 30 - } - }, - { - "filename": "641-therian_1", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 30 - }, - "frame": { - "x": 240, - "y": 450, - "w": 40, - "h": 30 - } - }, - { - "filename": "642-incarnate_1", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 30 - }, - "frame": { - "x": 280, - "y": 450, - "w": 40, - "h": 30 - } - }, - { - "filename": "642-therian_1", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 30 - }, - "frame": { - "x": 320, - "y": 450, - "w": 40, - "h": 30 - } - }, - { - "filename": "645-incarnate_1", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 30 - }, - "frame": { - "x": 360, - "y": 450, - "w": 40, - "h": 30 - } - }, - { - "filename": "645-therian_1", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 30 - }, - "frame": { - "x": 400, + "x": 480, "y": 450, "w": 40, "h": 30 @@ -4350,8 +4392,8 @@ "h": 30 }, "frame": { - "x": 440, - "y": 450, + "x": 0, + "y": 480, "w": 40, "h": 30 } @@ -4371,8 +4413,8 @@ "h": 30 }, "frame": { - "x": 480, - "y": 450, + "x": 40, + "y": 480, "w": 40, "h": 30 } @@ -4392,7 +4434,7 @@ "h": 30 }, "frame": { - "x": 0, + "x": 80, "y": 480, "w": 40, "h": 30 @@ -4413,7 +4455,7 @@ "h": 30 }, "frame": { - "x": 40, + "x": 120, "y": 480, "w": 40, "h": 30 @@ -4434,7 +4476,7 @@ "h": 30 }, "frame": { - "x": 80, + "x": 160, "y": 480, "w": 40, "h": 30 @@ -4455,7 +4497,7 @@ "h": 30 }, "frame": { - "x": 120, + "x": 200, "y": 480, "w": 40, "h": 30 @@ -4476,7 +4518,7 @@ "h": 30 }, "frame": { - "x": 160, + "x": 240, "y": 480, "w": 40, "h": 30 @@ -4497,7 +4539,7 @@ "h": 30 }, "frame": { - "x": 200, + "x": 280, "y": 480, "w": 40, "h": 30 @@ -4518,7 +4560,7 @@ "h": 30 }, "frame": { - "x": 240, + "x": 320, "y": 480, "w": 40, "h": 30 @@ -4539,7 +4581,7 @@ "h": 30 }, "frame": { - "x": 280, + "x": 360, "y": 480, "w": 40, "h": 30 @@ -4560,7 +4602,7 @@ "h": 30 }, "frame": { - "x": 320, + "x": 400, "y": 480, "w": 40, "h": 30 @@ -4581,7 +4623,7 @@ "h": 30 }, "frame": { - "x": 360, + "x": 440, "y": 480, "w": 40, "h": 30 @@ -4602,7 +4644,7 @@ "h": 30 }, "frame": { - "x": 400, + "x": 480, "y": 480, "w": 40, "h": 30 @@ -4622,48 +4664,6 @@ "w": 40, "h": 30 }, - "frame": { - "x": 440, - "y": 480, - "w": 40, - "h": 30 - } - }, - { - "filename": "649-shock_2", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 30 - }, - "frame": { - "x": 480, - "y": 480, - "w": 40, - "h": 30 - } - }, - { - "filename": "649-shock_3", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 30 - }, "frame": { "x": 0, "y": 510, @@ -4672,7 +4672,7 @@ } }, { - "filename": "649_2", + "filename": "649-shock_2", "rotated": false, "trimmed": false, "sourceSize": { @@ -4693,7 +4693,7 @@ } }, { - "filename": "649_3", + "filename": "649-shock_3", "rotated": false, "trimmed": false, "sourceSize": { @@ -4712,6 +4712,48 @@ "w": 40, "h": 30 } + }, + { + "filename": "649_2", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 40, + "h": 30 + }, + "frame": { + "x": 120, + "y": 510, + "w": 40, + "h": 30 + } + }, + { + "filename": "649_3", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 40, + "h": 30 + }, + "frame": { + "x": 160, + "y": 510, + "w": 40, + "h": 30 + } } ] } @@ -4719,6 +4761,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:1d4d7a5752cc0f9b170b6ff8c1d3c48f:160428857748b968d3c96b3422d45ffd:f1931bc28ee7f32dba7543723757cf2a$" + "smartupdate": "$TexturePacker:SmartUpdate:de9bd6aa34888f4236eaedcdd74c3751:29ac6a9febb19fa4ecdbe89310151b96:f1931bc28ee7f32dba7543723757cf2a$" } } diff --git a/public/images/pokemon_icons_5v.png b/public/images/pokemon_icons_5v.png index 45a621e700a..1653884a356 100644 Binary files a/public/images/pokemon_icons_5v.png and b/public/images/pokemon_icons_5v.png differ