diff --git a/public/images/pokemon/icons/variant/2/187_2.png b/public/images/pokemon/icons/variant/2/187_2.png index 8803f7ee32a..c7da6a46115 100644 Binary files a/public/images/pokemon/icons/variant/2/187_2.png and b/public/images/pokemon/icons/variant/2/187_2.png differ diff --git a/public/images/pokemon/icons/variant/2/187_3.png b/public/images/pokemon/icons/variant/2/187_3.png index 543c686b41b..6f118aed4f4 100644 Binary files a/public/images/pokemon/icons/variant/2/187_3.png and b/public/images/pokemon/icons/variant/2/187_3.png differ diff --git a/public/images/pokemon/icons/variant/2/188_2.png b/public/images/pokemon/icons/variant/2/188_2.png index 53bd3a0f792..cbb7b690ff0 100644 Binary files a/public/images/pokemon/icons/variant/2/188_2.png and b/public/images/pokemon/icons/variant/2/188_2.png differ diff --git a/public/images/pokemon/icons/variant/2/188_3.png b/public/images/pokemon/icons/variant/2/188_3.png index 89265f886b9..2c4e64cc608 100644 Binary files a/public/images/pokemon/icons/variant/2/188_3.png and b/public/images/pokemon/icons/variant/2/188_3.png differ diff --git a/public/images/pokemon/icons/variant/2/189_2.png b/public/images/pokemon/icons/variant/2/189_2.png index f39c19a14fe..ca5e127816a 100644 Binary files a/public/images/pokemon/icons/variant/2/189_2.png and b/public/images/pokemon/icons/variant/2/189_2.png differ diff --git a/public/images/pokemon/icons/variant/2/189_3.png b/public/images/pokemon/icons/variant/2/189_3.png index 0fbf3c74fd0..dfee57baf86 100644 Binary files a/public/images/pokemon/icons/variant/2/189_3.png and b/public/images/pokemon/icons/variant/2/189_3.png differ diff --git a/public/images/pokemon/icons/variant/3/331_2.png b/public/images/pokemon/icons/variant/3/331_2.png index 08b90bb141b..19b80296a1e 100644 Binary files a/public/images/pokemon/icons/variant/3/331_2.png and b/public/images/pokemon/icons/variant/3/331_2.png differ diff --git a/public/images/pokemon/icons/variant/3/331_3.png b/public/images/pokemon/icons/variant/3/331_3.png index 78f61b34b57..01b93a1d086 100644 Binary files a/public/images/pokemon/icons/variant/3/331_3.png and b/public/images/pokemon/icons/variant/3/331_3.png differ diff --git a/public/images/pokemon/icons/variant/3/332_2.png b/public/images/pokemon/icons/variant/3/332_2.png index fd8882bda43..ff9077cec0a 100644 Binary files a/public/images/pokemon/icons/variant/3/332_2.png and b/public/images/pokemon/icons/variant/3/332_2.png differ diff --git a/public/images/pokemon/icons/variant/3/332_3.png b/public/images/pokemon/icons/variant/3/332_3.png index 6d1b07f3149..c1c6cee7947 100644 Binary files a/public/images/pokemon/icons/variant/3/332_3.png and b/public/images/pokemon/icons/variant/3/332_3.png differ diff --git a/public/images/pokemon_icons_2v.json b/public/images/pokemon_icons_2v.json index 06b96389e1e..519ea6c62f2 100644 --- a/public/images/pokemon_icons_2v.json +++ b/public/images/pokemon_icons_2v.json @@ -1421,20 +1421,20 @@ "rotated": false, "trimmed": false, "sourceSize": { - "w": 22, - "h": 20 + "w": 40, + "h": 30 }, "spriteSourceSize": { "x": 0, "y": 0, - "w": 22, - "h": 20 + "w": 40, + "h": 30 }, "frame": { "x": 80, "y": 150, - "w": 22, - "h": 20 + "w": 40, + "h": 30 } }, { @@ -1442,20 +1442,20 @@ "rotated": false, "trimmed": false, "sourceSize": { - "w": 22, - "h": 20 + "w": 40, + "h": 30 }, "spriteSourceSize": { "x": 0, "y": 0, - "w": 22, - "h": 20 + "w": 40, + "h": 30 }, "frame": { - "x": 102, + "x": 120, "y": 150, - "w": 22, - "h": 20 + "w": 40, + "h": 30 } }, { @@ -1463,20 +1463,20 @@ "rotated": false, "trimmed": false, "sourceSize": { - "w": 19, - "h": 17 + "w": 40, + "h": 30 }, "spriteSourceSize": { "x": 0, "y": 0, - "w": 19, - "h": 17 + "w": 40, + "h": 30 }, "frame": { - "x": 124, + "x": 160, "y": 150, - "w": 19, - "h": 17 + "w": 40, + "h": 30 } }, { @@ -1484,20 +1484,20 @@ "rotated": false, "trimmed": false, "sourceSize": { - "w": 19, - "h": 17 + "w": 40, + "h": 30 }, "spriteSourceSize": { "x": 0, "y": 0, - "w": 19, - "h": 17 + "w": 40, + "h": 30 }, "frame": { - "x": 143, + "x": 200, "y": 150, - "w": 19, - "h": 17 + "w": 40, + "h": 30 } }, { @@ -1505,20 +1505,20 @@ "rotated": false, "trimmed": false, "sourceSize": { - "w": 22, - "h": 22 + "w": 40, + "h": 30 }, "spriteSourceSize": { "x": 0, "y": 0, - "w": 22, - "h": 22 + "w": 40, + "h": 30 }, "frame": { - "x": 162, + "x": 240, "y": 150, - "w": 22, - "h": 22 + "w": 40, + "h": 30 } }, { @@ -1526,20 +1526,20 @@ "rotated": false, "trimmed": false, "sourceSize": { - "w": 22, - "h": 22 + "w": 40, + "h": 30 }, "spriteSourceSize": { "x": 0, "y": 0, - "w": 22, - "h": 22 + "w": 40, + "h": 30 }, "frame": { - "x": 184, + "x": 280, "y": 150, - "w": 22, - "h": 22 + "w": 40, + "h": 30 } }, { @@ -1557,7 +1557,7 @@ "h": 30 }, "frame": { - "x": 206, + "x": 320, "y": 150, "w": 40, "h": 30 @@ -1578,7 +1578,7 @@ "h": 30 }, "frame": { - "x": 246, + "x": 360, "y": 150, "w": 40, "h": 30 @@ -1599,7 +1599,7 @@ "h": 30 }, "frame": { - "x": 286, + "x": 400, "y": 150, "w": 40, "h": 30 @@ -1620,7 +1620,7 @@ "h": 30 }, "frame": { - "x": 326, + "x": 440, "y": 150, "w": 40, "h": 30 @@ -1641,7 +1641,7 @@ "h": 30 }, "frame": { - "x": 366, + "x": 480, "y": 150, "w": 40, "h": 30 @@ -1662,8 +1662,8 @@ "h": 30 }, "frame": { - "x": 406, - "y": 150, + "x": 0, + "y": 180, "w": 40, "h": 30 } @@ -1683,8 +1683,8 @@ "h": 30 }, "frame": { - "x": 446, - "y": 150, + "x": 40, + "y": 180, "w": 40, "h": 30 } @@ -1704,8 +1704,8 @@ "h": 30 }, "frame": { - "x": 486, - "y": 150, + "x": 80, + "y": 180, "w": 40, "h": 30 } @@ -1725,7 +1725,7 @@ "h": 30 }, "frame": { - "x": 0, + "x": 120, "y": 180, "w": 40, "h": 30 @@ -1746,7 +1746,7 @@ "h": 30 }, "frame": { - "x": 40, + "x": 160, "y": 180, "w": 40, "h": 30 @@ -1767,7 +1767,7 @@ "h": 30 }, "frame": { - "x": 80, + "x": 200, "y": 180, "w": 40, "h": 30 @@ -1788,7 +1788,7 @@ "h": 30 }, "frame": { - "x": 120, + "x": 240, "y": 180, "w": 40, "h": 30 @@ -1809,7 +1809,7 @@ "h": 30 }, "frame": { - "x": 160, + "x": 280, "y": 180, "w": 40, "h": 30 @@ -1830,7 +1830,7 @@ "h": 30 }, "frame": { - "x": 200, + "x": 320, "y": 180, "w": 40, "h": 30 @@ -1851,7 +1851,7 @@ "h": 30 }, "frame": { - "x": 200, + "x": 320, "y": 180, "w": 40, "h": 30 @@ -1872,7 +1872,7 @@ "h": 30 }, "frame": { - "x": 240, + "x": 360, "y": 180, "w": 40, "h": 30 @@ -1893,7 +1893,7 @@ "h": 30 }, "frame": { - "x": 240, + "x": 360, "y": 180, "w": 40, "h": 30 @@ -1914,7 +1914,7 @@ "h": 30 }, "frame": { - "x": 280, + "x": 400, "y": 180, "w": 40, "h": 30 @@ -1935,7 +1935,7 @@ "h": 30 }, "frame": { - "x": 320, + "x": 440, "y": 180, "w": 40, "h": 30 @@ -1956,7 +1956,7 @@ "h": 30 }, "frame": { - "x": 360, + "x": 480, "y": 180, "w": 40, "h": 30 @@ -1977,8 +1977,8 @@ "h": 30 }, "frame": { - "x": 400, - "y": 180, + "x": 0, + "y": 210, "w": 40, "h": 30 } @@ -1998,8 +1998,8 @@ "h": 30 }, "frame": { - "x": 440, - "y": 180, + "x": 40, + "y": 210, "w": 40, "h": 30 } @@ -2019,8 +2019,8 @@ "h": 30 }, "frame": { - "x": 480, - "y": 180, + "x": 80, + "y": 210, "w": 40, "h": 30 } @@ -2040,7 +2040,7 @@ "h": 30 }, "frame": { - "x": 0, + "x": 120, "y": 210, "w": 40, "h": 30 @@ -2061,7 +2061,7 @@ "h": 30 }, "frame": { - "x": 40, + "x": 160, "y": 210, "w": 40, "h": 30 @@ -2082,7 +2082,7 @@ "h": 30 }, "frame": { - "x": 80, + "x": 200, "y": 210, "w": 40, "h": 30 @@ -2103,7 +2103,7 @@ "h": 30 }, "frame": { - "x": 120, + "x": 240, "y": 210, "w": 40, "h": 30 @@ -2124,7 +2124,7 @@ "h": 30 }, "frame": { - "x": 160, + "x": 280, "y": 210, "w": 40, "h": 30 @@ -2145,7 +2145,7 @@ "h": 30 }, "frame": { - "x": 200, + "x": 320, "y": 210, "w": 40, "h": 30 @@ -2166,7 +2166,7 @@ "h": 30 }, "frame": { - "x": 240, + "x": 360, "y": 210, "w": 40, "h": 30 @@ -2187,7 +2187,7 @@ "h": 30 }, "frame": { - "x": 280, + "x": 400, "y": 210, "w": 40, "h": 30 @@ -2208,7 +2208,7 @@ "h": 30 }, "frame": { - "x": 320, + "x": 440, "y": 210, "w": 40, "h": 30 @@ -2229,7 +2229,7 @@ "h": 30 }, "frame": { - "x": 360, + "x": 480, "y": 210, "w": 40, "h": 30 @@ -2250,8 +2250,8 @@ "h": 30 }, "frame": { - "x": 400, - "y": 210, + "x": 0, + "y": 240, "w": 40, "h": 30 } @@ -2271,8 +2271,8 @@ "h": 30 }, "frame": { - "x": 440, - "y": 210, + "x": 40, + "y": 240, "w": 40, "h": 30 } @@ -2292,8 +2292,8 @@ "h": 30 }, "frame": { - "x": 480, - "y": 210, + "x": 80, + "y": 240, "w": 40, "h": 30 } @@ -2313,7 +2313,7 @@ "h": 30 }, "frame": { - "x": 0, + "x": 120, "y": 240, "w": 40, "h": 30 @@ -2334,7 +2334,7 @@ "h": 30 }, "frame": { - "x": 40, + "x": 160, "y": 240, "w": 40, "h": 30 @@ -2355,7 +2355,7 @@ "h": 30 }, "frame": { - "x": 80, + "x": 200, "y": 240, "w": 40, "h": 30 @@ -2376,7 +2376,7 @@ "h": 30 }, "frame": { - "x": 120, + "x": 240, "y": 240, "w": 40, "h": 30 @@ -2397,7 +2397,7 @@ "h": 30 }, "frame": { - "x": 160, + "x": 280, "y": 240, "w": 40, "h": 30 @@ -2418,7 +2418,7 @@ "h": 30 }, "frame": { - "x": 200, + "x": 320, "y": 240, "w": 40, "h": 30 @@ -2439,7 +2439,7 @@ "h": 30 }, "frame": { - "x": 240, + "x": 360, "y": 240, "w": 40, "h": 30 @@ -2460,7 +2460,7 @@ "h": 30 }, "frame": { - "x": 280, + "x": 400, "y": 240, "w": 40, "h": 30 @@ -2481,7 +2481,7 @@ "h": 30 }, "frame": { - "x": 320, + "x": 440, "y": 240, "w": 40, "h": 30 @@ -2502,7 +2502,7 @@ "h": 30 }, "frame": { - "x": 360, + "x": 480, "y": 240, "w": 40, "h": 30 @@ -2523,8 +2523,8 @@ "h": 30 }, "frame": { - "x": 400, - "y": 240, + "x": 0, + "y": 270, "w": 40, "h": 30 } @@ -2544,8 +2544,8 @@ "h": 30 }, "frame": { - "x": 440, - "y": 240, + "x": 40, + "y": 270, "w": 40, "h": 30 } @@ -2565,8 +2565,8 @@ "h": 30 }, "frame": { - "x": 480, - "y": 240, + "x": 80, + "y": 270, "w": 40, "h": 30 } @@ -2586,7 +2586,7 @@ "h": 30 }, "frame": { - "x": 0, + "x": 120, "y": 270, "w": 40, "h": 30 @@ -2607,7 +2607,7 @@ "h": 30 }, "frame": { - "x": 40, + "x": 160, "y": 270, "w": 40, "h": 30 @@ -2628,7 +2628,7 @@ "h": 30 }, "frame": { - "x": 80, + "x": 200, "y": 270, "w": 40, "h": 30 @@ -2649,7 +2649,7 @@ "h": 30 }, "frame": { - "x": 120, + "x": 240, "y": 270, "w": 40, "h": 30 @@ -2670,7 +2670,7 @@ "h": 30 }, "frame": { - "x": 160, + "x": 280, "y": 270, "w": 40, "h": 30 @@ -2691,7 +2691,7 @@ "h": 30 }, "frame": { - "x": 200, + "x": 320, "y": 270, "w": 40, "h": 30 @@ -2712,7 +2712,7 @@ "h": 30 }, "frame": { - "x": 240, + "x": 360, "y": 270, "w": 40, "h": 30 @@ -2733,7 +2733,7 @@ "h": 30 }, "frame": { - "x": 280, + "x": 400, "y": 270, "w": 40, "h": 30 @@ -2754,7 +2754,7 @@ "h": 30 }, "frame": { - "x": 320, + "x": 440, "y": 270, "w": 40, "h": 30 @@ -2775,7 +2775,7 @@ "h": 30 }, "frame": { - "x": 360, + "x": 480, "y": 270, "w": 40, "h": 30 @@ -2796,8 +2796,8 @@ "h": 30 }, "frame": { - "x": 400, - "y": 270, + "x": 0, + "y": 300, "w": 40, "h": 30 } @@ -2817,8 +2817,8 @@ "h": 30 }, "frame": { - "x": 440, - "y": 270, + "x": 40, + "y": 300, "w": 40, "h": 30 } @@ -2838,8 +2838,8 @@ "h": 30 }, "frame": { - "x": 480, - "y": 270, + "x": 80, + "y": 300, "w": 40, "h": 30 } @@ -2859,7 +2859,7 @@ "h": 30 }, "frame": { - "x": 0, + "x": 120, "y": 300, "w": 40, "h": 30 @@ -2880,7 +2880,7 @@ "h": 30 }, "frame": { - "x": 40, + "x": 160, "y": 300, "w": 40, "h": 30 @@ -2901,7 +2901,7 @@ "h": 30 }, "frame": { - "x": 80, + "x": 200, "y": 300, "w": 40, "h": 30 @@ -2922,7 +2922,7 @@ "h": 30 }, "frame": { - "x": 120, + "x": 240, "y": 300, "w": 40, "h": 30 @@ -2943,7 +2943,7 @@ "h": 30 }, "frame": { - "x": 160, + "x": 280, "y": 300, "w": 40, "h": 30 @@ -2964,7 +2964,7 @@ "h": 30 }, "frame": { - "x": 200, + "x": 320, "y": 300, "w": 40, "h": 30 @@ -2985,7 +2985,7 @@ "h": 30 }, "frame": { - "x": 240, + "x": 360, "y": 300, "w": 40, "h": 30 @@ -3006,7 +3006,7 @@ "h": 30 }, "frame": { - "x": 280, + "x": 400, "y": 300, "w": 40, "h": 30 @@ -3027,7 +3027,7 @@ "h": 30 }, "frame": { - "x": 320, + "x": 440, "y": 300, "w": 40, "h": 30 @@ -3048,7 +3048,7 @@ "h": 30 }, "frame": { - "x": 360, + "x": 480, "y": 300, "w": 40, "h": 30 @@ -3069,8 +3069,8 @@ "h": 30 }, "frame": { - "x": 400, - "y": 300, + "x": 0, + "y": 330, "w": 40, "h": 30 } @@ -3090,8 +3090,8 @@ "h": 30 }, "frame": { - "x": 440, - "y": 300, + "x": 40, + "y": 330, "w": 40, "h": 30 } @@ -3111,8 +3111,8 @@ "h": 30 }, "frame": { - "x": 480, - "y": 300, + "x": 80, + "y": 330, "w": 40, "h": 30 } @@ -3132,7 +3132,7 @@ "h": 30 }, "frame": { - "x": 0, + "x": 120, "y": 330, "w": 40, "h": 30 @@ -3153,7 +3153,7 @@ "h": 30 }, "frame": { - "x": 40, + "x": 160, "y": 330, "w": 40, "h": 30 @@ -3174,7 +3174,7 @@ "h": 30 }, "frame": { - "x": 80, + "x": 200, "y": 330, "w": 40, "h": 30 @@ -3195,7 +3195,7 @@ "h": 30 }, "frame": { - "x": 120, + "x": 240, "y": 330, "w": 40, "h": 30 @@ -3216,7 +3216,7 @@ "h": 30 }, "frame": { - "x": 160, + "x": 280, "y": 330, "w": 40, "h": 30 @@ -3237,7 +3237,7 @@ "h": 30 }, "frame": { - "x": 200, + "x": 320, "y": 330, "w": 40, "h": 30 @@ -3258,7 +3258,7 @@ "h": 30 }, "frame": { - "x": 240, + "x": 360, "y": 330, "w": 40, "h": 30 @@ -3279,7 +3279,7 @@ "h": 30 }, "frame": { - "x": 280, + "x": 400, "y": 330, "w": 40, "h": 30 @@ -3300,7 +3300,7 @@ "h": 30 }, "frame": { - "x": 320, + "x": 440, "y": 330, "w": 40, "h": 30 @@ -3321,7 +3321,7 @@ "h": 30 }, "frame": { - "x": 360, + "x": 480, "y": 330, "w": 40, "h": 30 @@ -3342,8 +3342,8 @@ "h": 30 }, "frame": { - "x": 400, - "y": 330, + "x": 0, + "y": 360, "w": 40, "h": 30 } @@ -3363,8 +3363,8 @@ "h": 30 }, "frame": { - "x": 440, - "y": 330, + "x": 40, + "y": 360, "w": 40, "h": 30 } @@ -3384,8 +3384,8 @@ "h": 30 }, "frame": { - "x": 480, - "y": 330, + "x": 80, + "y": 360, "w": 40, "h": 30 } @@ -3405,7 +3405,7 @@ "h": 30 }, "frame": { - "x": 0, + "x": 120, "y": 360, "w": 40, "h": 30 @@ -3426,7 +3426,7 @@ "h": 30 }, "frame": { - "x": 40, + "x": 160, "y": 360, "w": 40, "h": 30 @@ -3447,7 +3447,7 @@ "h": 30 }, "frame": { - "x": 80, + "x": 200, "y": 360, "w": 40, "h": 30 @@ -3468,7 +3468,7 @@ "h": 30 }, "frame": { - "x": 120, + "x": 240, "y": 360, "w": 40, "h": 30 @@ -3489,7 +3489,7 @@ "h": 30 }, "frame": { - "x": 160, + "x": 280, "y": 360, "w": 40, "h": 30 @@ -3510,7 +3510,7 @@ "h": 30 }, "frame": { - "x": 200, + "x": 320, "y": 360, "w": 40, "h": 30 @@ -3531,7 +3531,7 @@ "h": 30 }, "frame": { - "x": 240, + "x": 360, "y": 360, "w": 40, "h": 30 @@ -3552,7 +3552,7 @@ "h": 30 }, "frame": { - "x": 280, + "x": 400, "y": 360, "w": 40, "h": 30 @@ -3573,7 +3573,7 @@ "h": 30 }, "frame": { - "x": 320, + "x": 440, "y": 360, "w": 40, "h": 30 @@ -3594,7 +3594,7 @@ "h": 30 }, "frame": { - "x": 360, + "x": 480, "y": 360, "w": 40, "h": 30 @@ -3615,8 +3615,8 @@ "h": 30 }, "frame": { - "x": 400, - "y": 360, + "x": 0, + "y": 390, "w": 40, "h": 30 } @@ -3636,8 +3636,8 @@ "h": 30 }, "frame": { - "x": 440, - "y": 360, + "x": 40, + "y": 390, "w": 40, "h": 30 } @@ -3657,8 +3657,8 @@ "h": 30 }, "frame": { - "x": 480, - "y": 360, + "x": 80, + "y": 390, "w": 40, "h": 30 } @@ -3678,7 +3678,7 @@ "h": 30 }, "frame": { - "x": 0, + "x": 120, "y": 390, "w": 40, "h": 30 @@ -3699,7 +3699,7 @@ "h": 30 }, "frame": { - "x": 40, + "x": 160, "y": 390, "w": 40, "h": 30 @@ -3720,7 +3720,7 @@ "h": 30 }, "frame": { - "x": 80, + "x": 200, "y": 390, "w": 40, "h": 30 @@ -3741,7 +3741,7 @@ "h": 30 }, "frame": { - "x": 120, + "x": 240, "y": 390, "w": 40, "h": 30 @@ -3762,7 +3762,7 @@ "h": 30 }, "frame": { - "x": 160, + "x": 280, "y": 390, "w": 40, "h": 30 @@ -3783,7 +3783,7 @@ "h": 30 }, "frame": { - "x": 200, + "x": 320, "y": 390, "w": 40, "h": 30 @@ -3804,7 +3804,7 @@ "h": 30 }, "frame": { - "x": 240, + "x": 360, "y": 390, "w": 40, "h": 30 @@ -3825,7 +3825,7 @@ "h": 30 }, "frame": { - "x": 280, + "x": 400, "y": 390, "w": 40, "h": 30 @@ -3846,7 +3846,7 @@ "h": 30 }, "frame": { - "x": 320, + "x": 440, "y": 390, "w": 40, "h": 30 @@ -3867,7 +3867,7 @@ "h": 30 }, "frame": { - "x": 360, + "x": 480, "y": 390, "w": 40, "h": 30 @@ -3888,8 +3888,8 @@ "h": 30 }, "frame": { - "x": 400, - "y": 390, + "x": 0, + "y": 420, "w": 40, "h": 30 } @@ -3909,8 +3909,8 @@ "h": 30 }, "frame": { - "x": 440, - "y": 390, + "x": 40, + "y": 420, "w": 40, "h": 30 } @@ -3930,8 +3930,8 @@ "h": 30 }, "frame": { - "x": 480, - "y": 390, + "x": 80, + "y": 420, "w": 40, "h": 30 } @@ -3951,7 +3951,7 @@ "h": 30 }, "frame": { - "x": 0, + "x": 120, "y": 420, "w": 40, "h": 30 @@ -3972,7 +3972,7 @@ "h": 30 }, "frame": { - "x": 40, + "x": 160, "y": 420, "w": 40, "h": 30 @@ -3993,7 +3993,7 @@ "h": 30 }, "frame": { - "x": 80, + "x": 200, "y": 420, "w": 40, "h": 30 @@ -4014,7 +4014,7 @@ "h": 30 }, "frame": { - "x": 120, + "x": 240, "y": 420, "w": 40, "h": 30 @@ -4035,7 +4035,7 @@ "h": 30 }, "frame": { - "x": 160, + "x": 280, "y": 420, "w": 40, "h": 30 @@ -4056,7 +4056,7 @@ "h": 30 }, "frame": { - "x": 200, + "x": 320, "y": 420, "w": 40, "h": 30 @@ -4077,7 +4077,7 @@ "h": 30 }, "frame": { - "x": 240, + "x": 360, "y": 420, "w": 40, "h": 30 @@ -4098,7 +4098,7 @@ "h": 30 }, "frame": { - "x": 280, + "x": 400, "y": 420, "w": 40, "h": 30 @@ -4119,7 +4119,7 @@ "h": 30 }, "frame": { - "x": 320, + "x": 440, "y": 420, "w": 40, "h": 30 @@ -4140,7 +4140,7 @@ "h": 30 }, "frame": { - "x": 360, + "x": 480, "y": 420, "w": 40, "h": 30 @@ -4161,8 +4161,8 @@ "h": 30 }, "frame": { - "x": 400, - "y": 420, + "x": 0, + "y": 450, "w": 40, "h": 30 } @@ -4182,8 +4182,8 @@ "h": 30 }, "frame": { - "x": 440, - "y": 420, + "x": 40, + "y": 450, "w": 40, "h": 30 } @@ -4203,8 +4203,8 @@ "h": 30 }, "frame": { - "x": 480, - "y": 420, + "x": 80, + "y": 450, "w": 40, "h": 30 } @@ -4224,7 +4224,7 @@ "h": 30 }, "frame": { - "x": 0, + "x": 120, "y": 450, "w": 40, "h": 30 @@ -4245,7 +4245,7 @@ "h": 30 }, "frame": { - "x": 40, + "x": 160, "y": 450, "w": 40, "h": 30 @@ -4266,7 +4266,7 @@ "h": 30 }, "frame": { - "x": 80, + "x": 200, "y": 450, "w": 40, "h": 30 @@ -4287,7 +4287,7 @@ "h": 30 }, "frame": { - "x": 120, + "x": 240, "y": 450, "w": 40, "h": 30 @@ -4308,7 +4308,7 @@ "h": 30 }, "frame": { - "x": 160, + "x": 280, "y": 450, "w": 40, "h": 30 @@ -4329,7 +4329,7 @@ "h": 30 }, "frame": { - "x": 200, + "x": 320, "y": 450, "w": 40, "h": 30 @@ -4350,7 +4350,7 @@ "h": 30 }, "frame": { - "x": 240, + "x": 360, "y": 450, "w": 40, "h": 30 @@ -4371,7 +4371,7 @@ "h": 30 }, "frame": { - "x": 280, + "x": 400, "y": 450, "w": 40, "h": 30 @@ -4392,7 +4392,7 @@ "h": 30 }, "frame": { - "x": 320, + "x": 440, "y": 450, "w": 40, "h": 30 @@ -4413,7 +4413,7 @@ "h": 30 }, "frame": { - "x": 360, + "x": 480, "y": 450, "w": 40, "h": 30 @@ -4434,8 +4434,8 @@ "h": 30 }, "frame": { - "x": 400, - "y": 450, + "x": 0, + "y": 480, "w": 40, "h": 30 } @@ -4455,8 +4455,8 @@ "h": 30 }, "frame": { - "x": 440, - "y": 450, + "x": 40, + "y": 480, "w": 40, "h": 30 } @@ -4476,8 +4476,8 @@ "h": 30 }, "frame": { - "x": 480, - "y": 450, + "x": 80, + "y": 480, "w": 40, "h": 30 } @@ -4497,7 +4497,7 @@ "h": 30 }, "frame": { - "x": 0, + "x": 120, "y": 480, "w": 40, "h": 30 @@ -4518,7 +4518,7 @@ "h": 30 }, "frame": { - "x": 40, + "x": 160, "y": 480, "w": 40, "h": 30 @@ -4539,7 +4539,7 @@ "h": 30 }, "frame": { - "x": 80, + "x": 200, "y": 480, "w": 40, "h": 30 @@ -4560,7 +4560,7 @@ "h": 30 }, "frame": { - "x": 120, + "x": 240, "y": 480, "w": 40, "h": 30 @@ -4581,7 +4581,7 @@ "h": 30 }, "frame": { - "x": 160, + "x": 280, "y": 480, "w": 40, "h": 30 @@ -4602,7 +4602,7 @@ "h": 30 }, "frame": { - "x": 200, + "x": 320, "y": 480, "w": 40, "h": 30 @@ -4623,7 +4623,7 @@ "h": 30 }, "frame": { - "x": 240, + "x": 360, "y": 480, "w": 40, "h": 30 @@ -4644,7 +4644,7 @@ "h": 30 }, "frame": { - "x": 280, + "x": 400, "y": 480, "w": 40, "h": 30 @@ -4665,7 +4665,7 @@ "h": 30 }, "frame": { - "x": 320, + "x": 440, "y": 480, "w": 40, "h": 30 @@ -4686,7 +4686,7 @@ "h": 30 }, "frame": { - "x": 360, + "x": 480, "y": 480, "w": 40, "h": 30 @@ -4706,69 +4706,6 @@ "w": 40, "h": 30 }, - "frame": { - "x": 400, - "y": 480, - "w": 40, - "h": 30 - } - }, - { - "filename": "249_2", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 30 - }, - "frame": { - "x": 440, - "y": 480, - "w": 40, - "h": 30 - } - }, - { - "filename": "249_3", - "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": "250_2", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 30 - }, "frame": { "x": 0, "y": 510, @@ -4777,7 +4714,7 @@ } }, { - "filename": "250_3", + "filename": "249_2", "rotated": false, "trimmed": false, "sourceSize": { @@ -4798,7 +4735,7 @@ } }, { - "filename": "251_2", + "filename": "249_3", "rotated": false, "trimmed": false, "sourceSize": { @@ -4819,7 +4756,7 @@ } }, { - "filename": "251_3", + "filename": "250_2", "rotated": false, "trimmed": false, "sourceSize": { @@ -4838,6 +4775,69 @@ "w": 40, "h": 30 } + }, + { + "filename": "250_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 + } + }, + { + "filename": "251_2", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 40, + "h": 30 + }, + "frame": { + "x": 200, + "y": 510, + "w": 40, + "h": 30 + } + }, + { + "filename": "251_3", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 40, + "h": 30 + }, + "frame": { + "x": 240, + "y": 510, + "w": 40, + "h": 30 + } } ] } @@ -4845,6 +4845,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:b3a75d768399b6ff1edc86f303530b7b:3131c5f2f1ad700164fc8307886f0c6c:63b368599cdc6e139499267117e91cd5$" + "smartupdate": "$TexturePacker:SmartUpdate:9bbc7b4492e80aa5722cc2bf05816872:55b15740d88d2f1d62acee04668f97a7:63b368599cdc6e139499267117e91cd5$" } } diff --git a/public/images/pokemon_icons_2v.png b/public/images/pokemon_icons_2v.png index caea2cc9f8f..fea0fb339ce 100644 Binary files a/public/images/pokemon_icons_2v.png and b/public/images/pokemon_icons_2v.png differ diff --git a/public/images/pokemon_icons_3v.json b/public/images/pokemon_icons_3v.json index aca9e918860..e18ce672c4e 100644 --- a/public/images/pokemon_icons_3v.json +++ b/public/images/pokemon_icons_3v.json @@ -2618,20 +2618,20 @@ "rotated": false, "trimmed": false, "sourceSize": { - "w": 22, - "h": 17 + "w": 40, + "h": 30 }, "spriteSourceSize": { "x": 0, "y": 0, - "w": 22, - "h": 17 + "w": 40, + "h": 30 }, "frame": { "x": 480, "y": 240, - "w": 22, - "h": 17 + "w": 40, + "h": 30 } }, { @@ -2639,20 +2639,20 @@ "rotated": false, "trimmed": false, "sourceSize": { - "w": 22, - "h": 17 + "w": 40, + "h": 30 }, "spriteSourceSize": { "x": 0, "y": 0, - "w": 22, - "h": 17 + "w": 40, + "h": 30 }, "frame": { - "x": 502, + "x": 520, "y": 240, - "w": 22, - "h": 17 + "w": 40, + "h": 30 } }, { @@ -2660,20 +2660,20 @@ "rotated": false, "trimmed": false, "sourceSize": { - "w": 19, - "h": 27 + "w": 40, + "h": 30 }, "spriteSourceSize": { "x": 0, "y": 0, - "w": 19, - "h": 27 + "w": 40, + "h": 30 }, "frame": { - "x": 524, - "y": 240, - "w": 19, - "h": 27 + "x": 0, + "y": 270, + "w": 40, + "h": 30 } }, { @@ -2681,20 +2681,20 @@ "rotated": false, "trimmed": false, "sourceSize": { - "w": 19, - "h": 27 + "w": 40, + "h": 30 }, "spriteSourceSize": { "x": 0, "y": 0, - "w": 19, - "h": 27 + "w": 40, + "h": 30 }, "frame": { - "x": 0, + "x": 40, "y": 270, - "w": 19, - "h": 27 + "w": 40, + "h": 30 } }, { @@ -2712,7 +2712,7 @@ "h": 30 }, "frame": { - "x": 19, + "x": 80, "y": 270, "w": 40, "h": 30 @@ -2733,7 +2733,7 @@ "h": 30 }, "frame": { - "x": 59, + "x": 120, "y": 270, "w": 40, "h": 30 @@ -2754,7 +2754,7 @@ "h": 30 }, "frame": { - "x": 99, + "x": 160, "y": 270, "w": 40, "h": 30 @@ -2775,7 +2775,7 @@ "h": 30 }, "frame": { - "x": 139, + "x": 200, "y": 270, "w": 40, "h": 30 @@ -2796,7 +2796,7 @@ "h": 30 }, "frame": { - "x": 179, + "x": 240, "y": 270, "w": 40, "h": 30 @@ -2817,7 +2817,7 @@ "h": 30 }, "frame": { - "x": 219, + "x": 280, "y": 270, "w": 40, "h": 30 @@ -2838,7 +2838,7 @@ "h": 30 }, "frame": { - "x": 259, + "x": 320, "y": 270, "w": 40, "h": 30 @@ -2859,7 +2859,7 @@ "h": 30 }, "frame": { - "x": 299, + "x": 360, "y": 270, "w": 40, "h": 30 @@ -2880,7 +2880,7 @@ "h": 30 }, "frame": { - "x": 339, + "x": 400, "y": 270, "w": 40, "h": 30 @@ -2901,7 +2901,7 @@ "h": 30 }, "frame": { - "x": 379, + "x": 440, "y": 270, "w": 40, "h": 30 @@ -2922,7 +2922,7 @@ "h": 30 }, "frame": { - "x": 419, + "x": 480, "y": 270, "w": 40, "h": 30 @@ -2943,7 +2943,7 @@ "h": 30 }, "frame": { - "x": 459, + "x": 520, "y": 270, "w": 40, "h": 30 @@ -2964,8 +2964,8 @@ "h": 30 }, "frame": { - "x": 499, - "y": 270, + "x": 0, + "y": 300, "w": 40, "h": 30 } @@ -2985,7 +2985,7 @@ "h": 30 }, "frame": { - "x": 0, + "x": 40, "y": 300, "w": 40, "h": 30 @@ -3006,7 +3006,7 @@ "h": 30 }, "frame": { - "x": 40, + "x": 80, "y": 300, "w": 40, "h": 30 @@ -3027,7 +3027,7 @@ "h": 30 }, "frame": { - "x": 80, + "x": 120, "y": 300, "w": 40, "h": 30 @@ -3048,7 +3048,7 @@ "h": 30 }, "frame": { - "x": 120, + "x": 160, "y": 300, "w": 40, "h": 30 @@ -3069,7 +3069,7 @@ "h": 30 }, "frame": { - "x": 160, + "x": 200, "y": 300, "w": 40, "h": 30 @@ -3090,7 +3090,7 @@ "h": 30 }, "frame": { - "x": 200, + "x": 240, "y": 300, "w": 40, "h": 30 @@ -3111,7 +3111,7 @@ "h": 30 }, "frame": { - "x": 240, + "x": 280, "y": 300, "w": 40, "h": 30 @@ -3132,7 +3132,7 @@ "h": 30 }, "frame": { - "x": 280, + "x": 320, "y": 300, "w": 40, "h": 30 @@ -3153,7 +3153,7 @@ "h": 30 }, "frame": { - "x": 320, + "x": 360, "y": 300, "w": 40, "h": 30 @@ -3174,7 +3174,7 @@ "h": 30 }, "frame": { - "x": 360, + "x": 400, "y": 300, "w": 40, "h": 30 @@ -3195,7 +3195,7 @@ "h": 30 }, "frame": { - "x": 400, + "x": 440, "y": 300, "w": 40, "h": 30 @@ -3216,7 +3216,7 @@ "h": 30 }, "frame": { - "x": 440, + "x": 480, "y": 300, "w": 40, "h": 30 @@ -3237,7 +3237,7 @@ "h": 30 }, "frame": { - "x": 480, + "x": 520, "y": 300, "w": 40, "h": 30 @@ -3258,8 +3258,8 @@ "h": 30 }, "frame": { - "x": 520, - "y": 300, + "x": 0, + "y": 330, "w": 40, "h": 30 } @@ -3279,7 +3279,7 @@ "h": 30 }, "frame": { - "x": 0, + "x": 40, "y": 330, "w": 40, "h": 30 @@ -3300,7 +3300,7 @@ "h": 30 }, "frame": { - "x": 40, + "x": 80, "y": 330, "w": 40, "h": 30 @@ -3321,7 +3321,7 @@ "h": 30 }, "frame": { - "x": 80, + "x": 120, "y": 330, "w": 40, "h": 30 @@ -3342,7 +3342,7 @@ "h": 30 }, "frame": { - "x": 120, + "x": 160, "y": 330, "w": 40, "h": 30 @@ -3363,7 +3363,7 @@ "h": 30 }, "frame": { - "x": 160, + "x": 200, "y": 330, "w": 40, "h": 30 @@ -3384,7 +3384,7 @@ "h": 30 }, "frame": { - "x": 200, + "x": 240, "y": 330, "w": 40, "h": 30 @@ -3405,7 +3405,7 @@ "h": 30 }, "frame": { - "x": 240, + "x": 280, "y": 330, "w": 40, "h": 30 @@ -3426,7 +3426,7 @@ "h": 30 }, "frame": { - "x": 280, + "x": 320, "y": 330, "w": 40, "h": 30 @@ -3447,7 +3447,7 @@ "h": 30 }, "frame": { - "x": 320, + "x": 360, "y": 330, "w": 40, "h": 30 @@ -3468,7 +3468,7 @@ "h": 30 }, "frame": { - "x": 360, + "x": 400, "y": 330, "w": 40, "h": 30 @@ -3489,7 +3489,7 @@ "h": 30 }, "frame": { - "x": 400, + "x": 440, "y": 330, "w": 40, "h": 30 @@ -3510,7 +3510,7 @@ "h": 30 }, "frame": { - "x": 440, + "x": 480, "y": 330, "w": 40, "h": 30 @@ -3531,7 +3531,7 @@ "h": 30 }, "frame": { - "x": 480, + "x": 520, "y": 330, "w": 40, "h": 30 @@ -3552,8 +3552,8 @@ "h": 30 }, "frame": { - "x": 520, - "y": 330, + "x": 0, + "y": 360, "w": 40, "h": 30 } @@ -3573,7 +3573,7 @@ "h": 30 }, "frame": { - "x": 0, + "x": 40, "y": 360, "w": 40, "h": 30 @@ -3594,7 +3594,7 @@ "h": 30 }, "frame": { - "x": 40, + "x": 80, "y": 360, "w": 40, "h": 30 @@ -3615,7 +3615,7 @@ "h": 30 }, "frame": { - "x": 80, + "x": 120, "y": 360, "w": 40, "h": 30 @@ -3636,7 +3636,7 @@ "h": 30 }, "frame": { - "x": 120, + "x": 160, "y": 360, "w": 40, "h": 30 @@ -3657,7 +3657,7 @@ "h": 30 }, "frame": { - "x": 160, + "x": 200, "y": 360, "w": 40, "h": 30 @@ -3678,7 +3678,7 @@ "h": 30 }, "frame": { - "x": 200, + "x": 240, "y": 360, "w": 40, "h": 30 @@ -3699,7 +3699,7 @@ "h": 30 }, "frame": { - "x": 240, + "x": 280, "y": 360, "w": 40, "h": 30 @@ -3720,7 +3720,7 @@ "h": 30 }, "frame": { - "x": 280, + "x": 320, "y": 360, "w": 40, "h": 30 @@ -3741,7 +3741,7 @@ "h": 30 }, "frame": { - "x": 320, + "x": 360, "y": 360, "w": 40, "h": 30 @@ -3762,7 +3762,7 @@ "h": 30 }, "frame": { - "x": 360, + "x": 400, "y": 360, "w": 40, "h": 30 @@ -3783,7 +3783,7 @@ "h": 30 }, "frame": { - "x": 400, + "x": 440, "y": 360, "w": 40, "h": 30 @@ -3804,7 +3804,7 @@ "h": 30 }, "frame": { - "x": 440, + "x": 480, "y": 360, "w": 40, "h": 30 @@ -3825,7 +3825,7 @@ "h": 30 }, "frame": { - "x": 480, + "x": 520, "y": 360, "w": 40, "h": 30 @@ -3846,8 +3846,8 @@ "h": 30 }, "frame": { - "x": 520, - "y": 360, + "x": 0, + "y": 390, "w": 40, "h": 30 } @@ -3867,7 +3867,7 @@ "h": 30 }, "frame": { - "x": 0, + "x": 40, "y": 390, "w": 40, "h": 30 @@ -3888,7 +3888,7 @@ "h": 30 }, "frame": { - "x": 40, + "x": 80, "y": 390, "w": 40, "h": 30 @@ -3909,7 +3909,7 @@ "h": 30 }, "frame": { - "x": 80, + "x": 120, "y": 390, "w": 40, "h": 30 @@ -3930,7 +3930,7 @@ "h": 30 }, "frame": { - "x": 120, + "x": 160, "y": 390, "w": 40, "h": 30 @@ -3951,7 +3951,7 @@ "h": 30 }, "frame": { - "x": 160, + "x": 200, "y": 390, "w": 40, "h": 30 @@ -3972,7 +3972,7 @@ "h": 30 }, "frame": { - "x": 200, + "x": 240, "y": 390, "w": 40, "h": 30 @@ -3993,7 +3993,7 @@ "h": 30 }, "frame": { - "x": 240, + "x": 280, "y": 390, "w": 40, "h": 30 @@ -4014,7 +4014,7 @@ "h": 30 }, "frame": { - "x": 280, + "x": 320, "y": 390, "w": 40, "h": 30 @@ -4035,7 +4035,7 @@ "h": 30 }, "frame": { - "x": 320, + "x": 360, "y": 390, "w": 40, "h": 30 @@ -4056,7 +4056,7 @@ "h": 30 }, "frame": { - "x": 360, + "x": 400, "y": 390, "w": 40, "h": 30 @@ -4077,7 +4077,7 @@ "h": 30 }, "frame": { - "x": 400, + "x": 440, "y": 390, "w": 40, "h": 30 @@ -4098,7 +4098,7 @@ "h": 30 }, "frame": { - "x": 440, + "x": 480, "y": 390, "w": 40, "h": 30 @@ -4119,7 +4119,7 @@ "h": 30 }, "frame": { - "x": 480, + "x": 520, "y": 390, "w": 40, "h": 30 @@ -4140,8 +4140,8 @@ "h": 30 }, "frame": { - "x": 520, - "y": 390, + "x": 0, + "y": 420, "w": 40, "h": 30 } @@ -4161,7 +4161,7 @@ "h": 30 }, "frame": { - "x": 0, + "x": 40, "y": 420, "w": 40, "h": 30 @@ -4182,7 +4182,7 @@ "h": 30 }, "frame": { - "x": 40, + "x": 80, "y": 420, "w": 40, "h": 30 @@ -4203,7 +4203,7 @@ "h": 30 }, "frame": { - "x": 80, + "x": 120, "y": 420, "w": 40, "h": 30 @@ -4224,7 +4224,7 @@ "h": 30 }, "frame": { - "x": 120, + "x": 160, "y": 420, "w": 40, "h": 30 @@ -4245,7 +4245,7 @@ "h": 30 }, "frame": { - "x": 160, + "x": 200, "y": 420, "w": 40, "h": 30 @@ -4266,7 +4266,7 @@ "h": 30 }, "frame": { - "x": 200, + "x": 240, "y": 420, "w": 40, "h": 30 @@ -4287,7 +4287,7 @@ "h": 30 }, "frame": { - "x": 240, + "x": 280, "y": 420, "w": 40, "h": 30 @@ -4308,7 +4308,7 @@ "h": 30 }, "frame": { - "x": 280, + "x": 320, "y": 420, "w": 40, "h": 30 @@ -4329,7 +4329,7 @@ "h": 30 }, "frame": { - "x": 320, + "x": 360, "y": 420, "w": 40, "h": 30 @@ -4350,7 +4350,7 @@ "h": 30 }, "frame": { - "x": 360, + "x": 400, "y": 420, "w": 40, "h": 30 @@ -4371,7 +4371,7 @@ "h": 30 }, "frame": { - "x": 400, + "x": 440, "y": 420, "w": 40, "h": 30 @@ -4392,7 +4392,7 @@ "h": 30 }, "frame": { - "x": 440, + "x": 480, "y": 420, "w": 40, "h": 30 @@ -4413,7 +4413,7 @@ "h": 30 }, "frame": { - "x": 480, + "x": 520, "y": 420, "w": 40, "h": 30 @@ -4434,8 +4434,8 @@ "h": 30 }, "frame": { - "x": 520, - "y": 420, + "x": 0, + "y": 450, "w": 40, "h": 30 } @@ -4455,7 +4455,7 @@ "h": 30 }, "frame": { - "x": 0, + "x": 40, "y": 450, "w": 40, "h": 30 @@ -4476,7 +4476,7 @@ "h": 30 }, "frame": { - "x": 40, + "x": 80, "y": 450, "w": 40, "h": 30 @@ -4497,7 +4497,7 @@ "h": 30 }, "frame": { - "x": 80, + "x": 120, "y": 450, "w": 40, "h": 30 @@ -4518,7 +4518,7 @@ "h": 30 }, "frame": { - "x": 120, + "x": 160, "y": 450, "w": 40, "h": 30 @@ -4539,7 +4539,7 @@ "h": 30 }, "frame": { - "x": 160, + "x": 200, "y": 450, "w": 40, "h": 30 @@ -4560,7 +4560,7 @@ "h": 30 }, "frame": { - "x": 200, + "x": 240, "y": 450, "w": 40, "h": 30 @@ -4581,7 +4581,7 @@ "h": 30 }, "frame": { - "x": 240, + "x": 280, "y": 450, "w": 40, "h": 30 @@ -4602,7 +4602,7 @@ "h": 30 }, "frame": { - "x": 280, + "x": 320, "y": 450, "w": 40, "h": 30 @@ -4623,7 +4623,7 @@ "h": 30 }, "frame": { - "x": 320, + "x": 360, "y": 450, "w": 40, "h": 30 @@ -4644,7 +4644,7 @@ "h": 30 }, "frame": { - "x": 360, + "x": 400, "y": 450, "w": 40, "h": 30 @@ -4665,7 +4665,7 @@ "h": 30 }, "frame": { - "x": 400, + "x": 440, "y": 450, "w": 40, "h": 30 @@ -4686,7 +4686,7 @@ "h": 30 }, "frame": { - "x": 440, + "x": 480, "y": 450, "w": 40, "h": 30 @@ -4707,7 +4707,7 @@ "h": 30 }, "frame": { - "x": 480, + "x": 520, "y": 450, "w": 40, "h": 30 @@ -4727,27 +4727,6 @@ "w": 40, "h": 30 }, - "frame": { - "x": 520, - "y": 450, - "w": 40, - "h": 30 - } - }, - { - "filename": "382-primal_3", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 30 - }, "frame": { "x": 0, "y": 480, @@ -4756,7 +4735,7 @@ } }, { - "filename": "382_2", + "filename": "382-primal_3", "rotated": false, "trimmed": false, "sourceSize": { @@ -4777,7 +4756,7 @@ } }, { - "filename": "382_3", + "filename": "382_2", "rotated": false, "trimmed": false, "sourceSize": { @@ -4798,7 +4777,7 @@ } }, { - "filename": "383-primal_2", + "filename": "382_3", "rotated": false, "trimmed": false, "sourceSize": { @@ -4819,7 +4798,7 @@ } }, { - "filename": "383-primal_3", + "filename": "383-primal_2", "rotated": false, "trimmed": false, "sourceSize": { @@ -4840,7 +4819,7 @@ } }, { - "filename": "383_2", + "filename": "383-primal_3", "rotated": false, "trimmed": false, "sourceSize": { @@ -4861,7 +4840,7 @@ } }, { - "filename": "383_3", + "filename": "383_2", "rotated": false, "trimmed": false, "sourceSize": { @@ -4882,7 +4861,7 @@ } }, { - "filename": "384-mega_2", + "filename": "383_3", "rotated": false, "trimmed": false, "sourceSize": { @@ -4903,7 +4882,7 @@ } }, { - "filename": "384-mega_3", + "filename": "384-mega_2", "rotated": false, "trimmed": false, "sourceSize": { @@ -4924,7 +4903,7 @@ } }, { - "filename": "384_2", + "filename": "384-mega_3", "rotated": false, "trimmed": false, "sourceSize": { @@ -4945,7 +4924,7 @@ } }, { - "filename": "384_3", + "filename": "384_2", "rotated": false, "trimmed": false, "sourceSize": { @@ -4966,7 +4945,7 @@ } }, { - "filename": "385_1", + "filename": "384_3", "rotated": false, "trimmed": false, "sourceSize": { @@ -4987,7 +4966,7 @@ } }, { - "filename": "385_2", + "filename": "385_1", "rotated": false, "trimmed": false, "sourceSize": { @@ -5008,7 +4987,7 @@ } }, { - "filename": "385_3", + "filename": "385_2", "rotated": false, "trimmed": false, "sourceSize": { @@ -5027,6 +5006,27 @@ "w": 40, "h": 30 } + }, + { + "filename": "385_3", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 40, + "h": 30 + }, + "frame": { + "x": 0, + "y": 510, + "w": 40, + "h": 30 + } } ] } @@ -5034,6 +5034,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:cae76c86cff4be1bab7f5acffade03ce:1af8714263774f56309b39a826ef7626:039b026190bf1878996b3e03190bcdf3$" + "smartupdate": "$TexturePacker:SmartUpdate:205dbeed0e74aff154166e4664b6771c:8bafe4b4084b51e4e837c213db97e8a4:039b026190bf1878996b3e03190bcdf3$" } } diff --git a/public/images/pokemon_icons_3v.png b/public/images/pokemon_icons_3v.png index a7b636260f9..b151e36e72c 100644 Binary files a/public/images/pokemon_icons_3v.png and b/public/images/pokemon_icons_3v.png differ