diff --git a/public/audio/bgm/battle_legendary_k.mp3 b/public/audio/bgm/battle_legendary_kyurem.mp3 similarity index 100% rename from public/audio/bgm/battle_legendary_k.mp3 rename to public/audio/bgm/battle_legendary_kyurem.mp3 diff --git a/public/audio/bgm/battle_legendary_regis.mp3 b/public/audio/bgm/battle_legendary_regis.mp3 new file mode 100644 index 00000000000..227d544d91b Binary files /dev/null and b/public/audio/bgm/battle_legendary_regis.mp3 differ diff --git a/public/audio/bgm/battle_legendary_rz.mp3 b/public/audio/bgm/battle_legendary_res_zek.mp3 similarity index 100% rename from public/audio/bgm/battle_legendary_rz.mp3 rename to public/audio/bgm/battle_legendary_res_zek.mp3 diff --git a/public/audio/bgm/battle_legendary.mp3 b/public/audio/bgm/battle_legendary_unova.mp3 similarity index 100% rename from public/audio/bgm/battle_legendary.mp3 rename to public/audio/bgm/battle_legendary_unova.mp3 diff --git a/public/images/pokemon/icons/variant/1/118_1.png b/public/images/pokemon/icons/variant/1/118_1.png new file mode 100644 index 00000000000..595f76d7946 Binary files /dev/null and b/public/images/pokemon/icons/variant/1/118_1.png differ diff --git a/public/images/pokemon/icons/variant/1/29_2.png b/public/images/pokemon/icons/variant/1/29_2.png index 12d66fb1579..55b1f0eda37 100644 Binary files a/public/images/pokemon/icons/variant/1/29_2.png and b/public/images/pokemon/icons/variant/1/29_2.png differ diff --git a/public/images/pokemon/icons/variant/1/29_3.png b/public/images/pokemon/icons/variant/1/29_3.png index c5f1f4aae94..90326c212ab 100644 Binary files a/public/images/pokemon/icons/variant/1/29_3.png and b/public/images/pokemon/icons/variant/1/29_3.png differ diff --git a/public/images/pokemon/icons/variant/1/30_2.png b/public/images/pokemon/icons/variant/1/30_2.png index 29e97832b44..87cc4ec72ac 100644 Binary files a/public/images/pokemon/icons/variant/1/30_2.png and b/public/images/pokemon/icons/variant/1/30_2.png differ diff --git a/public/images/pokemon/icons/variant/1/30_3.png b/public/images/pokemon/icons/variant/1/30_3.png index 5d292322fee..3fe2fc43356 100644 Binary files a/public/images/pokemon/icons/variant/1/30_3.png and b/public/images/pokemon/icons/variant/1/30_3.png differ diff --git a/public/images/pokemon/icons/variant/1/31_1.png b/public/images/pokemon/icons/variant/1/31_1.png index 51ab04f75f6..ca7d5d98b14 100644 Binary files a/public/images/pokemon/icons/variant/1/31_1.png and b/public/images/pokemon/icons/variant/1/31_1.png differ diff --git a/public/images/pokemon/icons/variant/1/31_3.png b/public/images/pokemon/icons/variant/1/31_3.png index 020c42185e9..381a3108777 100644 Binary files a/public/images/pokemon/icons/variant/1/31_3.png and b/public/images/pokemon/icons/variant/1/31_3.png differ diff --git a/public/images/pokemon/icons/variant/3/278_1.png b/public/images/pokemon/icons/variant/3/278_1.png new file mode 100644 index 00000000000..4f8f65eabf2 Binary files /dev/null and b/public/images/pokemon/icons/variant/3/278_1.png differ diff --git a/public/images/pokemon/icons/variant/3/278_2.png b/public/images/pokemon/icons/variant/3/278_2.png new file mode 100644 index 00000000000..4791920bca5 Binary files /dev/null and b/public/images/pokemon/icons/variant/3/278_2.png differ diff --git a/public/images/pokemon/icons/variant/3/278_3.png b/public/images/pokemon/icons/variant/3/278_3.png new file mode 100644 index 00000000000..95555099b8d Binary files /dev/null and b/public/images/pokemon/icons/variant/3/278_3.png differ diff --git a/public/images/pokemon/icons/variant/3/279_1.png b/public/images/pokemon/icons/variant/3/279_1.png new file mode 100644 index 00000000000..661c6e102c7 Binary files /dev/null and b/public/images/pokemon/icons/variant/3/279_1.png differ diff --git a/public/images/pokemon/icons/variant/3/279_2.png b/public/images/pokemon/icons/variant/3/279_2.png new file mode 100644 index 00000000000..007f58ba39f Binary files /dev/null and b/public/images/pokemon/icons/variant/3/279_2.png differ diff --git a/public/images/pokemon/icons/variant/3/279_3.png b/public/images/pokemon/icons/variant/3/279_3.png new file mode 100644 index 00000000000..57c4e388fcc Binary files /dev/null and b/public/images/pokemon/icons/variant/3/279_3.png differ diff --git a/public/images/pokemon/icons/variant/3/320_2.png b/public/images/pokemon/icons/variant/3/320_2.png new file mode 100644 index 00000000000..3cc82654b85 Binary files /dev/null and b/public/images/pokemon/icons/variant/3/320_2.png differ diff --git a/public/images/pokemon/icons/variant/3/320_3.png b/public/images/pokemon/icons/variant/3/320_3.png new file mode 100644 index 00000000000..967dbe095fe Binary files /dev/null and b/public/images/pokemon/icons/variant/3/320_3.png differ diff --git a/public/images/pokemon/icons/variant/3/321_2.png b/public/images/pokemon/icons/variant/3/321_2.png new file mode 100644 index 00000000000..fc49d4dc014 Binary files /dev/null and b/public/images/pokemon/icons/variant/3/321_2.png differ diff --git a/public/images/pokemon/icons/variant/3/321_3.png b/public/images/pokemon/icons/variant/3/321_3.png new file mode 100644 index 00000000000..e672b28040c Binary files /dev/null and b/public/images/pokemon/icons/variant/3/321_3.png differ diff --git a/public/images/pokemon/icons/variant/3/333_2.png b/public/images/pokemon/icons/variant/3/333_2.png index 052e9cdbb6e..dba83c56e4c 100644 Binary files a/public/images/pokemon/icons/variant/3/333_2.png and b/public/images/pokemon/icons/variant/3/333_2.png differ diff --git a/public/images/pokemon/icons/variant/3/333_3.png b/public/images/pokemon/icons/variant/3/333_3.png index dba83c56e4c..052e9cdbb6e 100644 Binary files a/public/images/pokemon/icons/variant/3/333_3.png and b/public/images/pokemon/icons/variant/3/333_3.png differ diff --git a/public/images/pokemon/icons/variant/3/334_2.png b/public/images/pokemon/icons/variant/3/334_2.png index 08d3ac09a40..ed4a145fa40 100644 Binary files a/public/images/pokemon/icons/variant/3/334_2.png and b/public/images/pokemon/icons/variant/3/334_2.png differ diff --git a/public/images/pokemon/icons/variant/3/334_3.png b/public/images/pokemon/icons/variant/3/334_3.png index ed4a145fa40..08d3ac09a40 100644 Binary files a/public/images/pokemon/icons/variant/3/334_3.png and b/public/images/pokemon/icons/variant/3/334_3.png differ diff --git a/public/images/pokemon/icons/variant/4/485_2.png b/public/images/pokemon/icons/variant/4/485_2.png new file mode 100644 index 00000000000..57759e932a2 Binary files /dev/null and b/public/images/pokemon/icons/variant/4/485_2.png differ diff --git a/public/images/pokemon/icons/variant/4/485_3.png b/public/images/pokemon/icons/variant/4/485_3.png new file mode 100644 index 00000000000..2f133e8fb98 Binary files /dev/null and b/public/images/pokemon/icons/variant/4/485_3.png differ diff --git a/public/images/pokemon/icons/variant/5/547_2.png b/public/images/pokemon/icons/variant/5/547_2.png index 2294b11332a..767a0d4ad2f 100644 Binary files a/public/images/pokemon/icons/variant/5/547_2.png and b/public/images/pokemon/icons/variant/5/547_2.png differ diff --git a/public/images/pokemon/icons/variant/5/547_3.png b/public/images/pokemon/icons/variant/5/547_3.png index 1af57cc099a..a0c24d519a7 100644 Binary files a/public/images/pokemon/icons/variant/5/547_3.png and b/public/images/pokemon/icons/variant/5/547_3.png differ diff --git a/public/images/pokemon/icons/variant/5/592-f_1.png b/public/images/pokemon/icons/variant/5/592-f_1.png new file mode 100644 index 00000000000..b30360cd0c1 Binary files /dev/null and b/public/images/pokemon/icons/variant/5/592-f_1.png differ diff --git a/public/images/pokemon/icons/variant/5/592-f_2.png b/public/images/pokemon/icons/variant/5/592-f_2.png new file mode 100644 index 00000000000..42dec54329a Binary files /dev/null and b/public/images/pokemon/icons/variant/5/592-f_2.png differ diff --git a/public/images/pokemon/icons/variant/5/592-f_3.png b/public/images/pokemon/icons/variant/5/592-f_3.png new file mode 100644 index 00000000000..bb4dc0ff013 Binary files /dev/null and b/public/images/pokemon/icons/variant/5/592-f_3.png differ diff --git a/public/images/pokemon/icons/variant/5/592_2.png b/public/images/pokemon/icons/variant/5/592_2.png new file mode 100644 index 00000000000..fc869a64bf9 Binary files /dev/null and b/public/images/pokemon/icons/variant/5/592_2.png differ diff --git a/public/images/pokemon/icons/variant/5/592_3.png b/public/images/pokemon/icons/variant/5/592_3.png new file mode 100644 index 00000000000..202459f7641 Binary files /dev/null and b/public/images/pokemon/icons/variant/5/592_3.png differ diff --git a/public/images/pokemon/icons/variant/5/593-f_1.png b/public/images/pokemon/icons/variant/5/593-f_1.png new file mode 100644 index 00000000000..32d2e427ccd Binary files /dev/null and b/public/images/pokemon/icons/variant/5/593-f_1.png differ diff --git a/public/images/pokemon/icons/variant/5/593-f_2.png b/public/images/pokemon/icons/variant/5/593-f_2.png new file mode 100644 index 00000000000..348c5010668 Binary files /dev/null and b/public/images/pokemon/icons/variant/5/593-f_2.png differ diff --git a/public/images/pokemon/icons/variant/5/593-f_3.png b/public/images/pokemon/icons/variant/5/593-f_3.png new file mode 100644 index 00000000000..da94471a0c9 Binary files /dev/null and b/public/images/pokemon/icons/variant/5/593-f_3.png differ diff --git a/public/images/pokemon/icons/variant/5/593_2.png b/public/images/pokemon/icons/variant/5/593_2.png new file mode 100644 index 00000000000..ee7d77ef532 Binary files /dev/null and b/public/images/pokemon/icons/variant/5/593_2.png differ diff --git a/public/images/pokemon/icons/variant/5/593_3.png b/public/images/pokemon/icons/variant/5/593_3.png new file mode 100644 index 00000000000..0134d25d034 Binary files /dev/null and b/public/images/pokemon/icons/variant/5/593_3.png differ diff --git a/public/images/pokemon/icons/variant/5/619_2.png b/public/images/pokemon/icons/variant/5/619_2.png new file mode 100644 index 00000000000..61fb4716f24 Binary files /dev/null and b/public/images/pokemon/icons/variant/5/619_2.png differ diff --git a/public/images/pokemon/icons/variant/5/619_3.png b/public/images/pokemon/icons/variant/5/619_3.png new file mode 100644 index 00000000000..9af922c97fc Binary files /dev/null and b/public/images/pokemon/icons/variant/5/619_3.png differ diff --git a/public/images/pokemon/icons/variant/5/620_2.png b/public/images/pokemon/icons/variant/5/620_2.png new file mode 100644 index 00000000000..6042f2bb63b Binary files /dev/null and b/public/images/pokemon/icons/variant/5/620_2.png differ diff --git a/public/images/pokemon/icons/variant/5/620_3.png b/public/images/pokemon/icons/variant/5/620_3.png new file mode 100644 index 00000000000..09750c3eac4 Binary files /dev/null and b/public/images/pokemon/icons/variant/5/620_3.png differ diff --git a/public/images/pokemon/icons/variant/8/850_2.png b/public/images/pokemon/icons/variant/8/850_2.png new file mode 100644 index 00000000000..6b0d9c0634a Binary files /dev/null and b/public/images/pokemon/icons/variant/8/850_2.png differ diff --git a/public/images/pokemon/icons/variant/8/850_3.png b/public/images/pokemon/icons/variant/8/850_3.png new file mode 100644 index 00000000000..646f2c44bd8 Binary files /dev/null and b/public/images/pokemon/icons/variant/8/850_3.png differ diff --git a/public/images/pokemon/icons/variant/8/851_2.png b/public/images/pokemon/icons/variant/8/851_2.png new file mode 100644 index 00000000000..9da1c12a8a6 Binary files /dev/null and b/public/images/pokemon/icons/variant/8/851_2.png differ diff --git a/public/images/pokemon/icons/variant/8/851_3.png b/public/images/pokemon/icons/variant/8/851_3.png new file mode 100644 index 00000000000..32e9ec3cd42 Binary files /dev/null and b/public/images/pokemon/icons/variant/8/851_3.png differ diff --git a/public/images/pokemon/icons/variant/9/935_1.png b/public/images/pokemon/icons/variant/9/935_1.png new file mode 100644 index 00000000000..90c5add8062 Binary files /dev/null and b/public/images/pokemon/icons/variant/9/935_1.png differ diff --git a/public/images/pokemon/icons/variant/9/935_2.png b/public/images/pokemon/icons/variant/9/935_2.png new file mode 100644 index 00000000000..0dd9c43c941 Binary files /dev/null and b/public/images/pokemon/icons/variant/9/935_2.png differ diff --git a/public/images/pokemon/icons/variant/9/935_3.png b/public/images/pokemon/icons/variant/9/935_3.png index b8d1b63a1ed..5cfcb9b2380 100644 Binary files a/public/images/pokemon/icons/variant/9/935_3.png and b/public/images/pokemon/icons/variant/9/935_3.png differ diff --git a/public/images/pokemon/icons/variant/9/936_1.png b/public/images/pokemon/icons/variant/9/936_1.png new file mode 100644 index 00000000000..06c39d72867 Binary files /dev/null and b/public/images/pokemon/icons/variant/9/936_1.png differ diff --git a/public/images/pokemon/icons/variant/9/936_2.png b/public/images/pokemon/icons/variant/9/936_2.png new file mode 100644 index 00000000000..80e4f83d134 Binary files /dev/null and b/public/images/pokemon/icons/variant/9/936_2.png differ diff --git a/public/images/pokemon/icons/variant/9/936_3.png b/public/images/pokemon/icons/variant/9/936_3.png index f2a53aedf09..2e2b6cde22e 100644 Binary files a/public/images/pokemon/icons/variant/9/936_3.png and b/public/images/pokemon/icons/variant/9/936_3.png differ diff --git a/public/images/pokemon/icons/variant/9/937_1.png b/public/images/pokemon/icons/variant/9/937_1.png new file mode 100644 index 00000000000..e45d536a6b0 Binary files /dev/null and b/public/images/pokemon/icons/variant/9/937_1.png differ diff --git a/public/images/pokemon/icons/variant/9/937_2.png b/public/images/pokemon/icons/variant/9/937_2.png new file mode 100644 index 00000000000..1362ef759f7 Binary files /dev/null and b/public/images/pokemon/icons/variant/9/937_2.png differ diff --git a/public/images/pokemon/icons/variant/9/937_3.png b/public/images/pokemon/icons/variant/9/937_3.png new file mode 100644 index 00000000000..cc0a05cea0b Binary files /dev/null and b/public/images/pokemon/icons/variant/9/937_3.png differ diff --git a/public/images/pokemon/variant/29.json b/public/images/pokemon/variant/29.json index 51b8fb15bec..1ed0ecf0d99 100644 --- a/public/images/pokemon/variant/29.json +++ b/public/images/pokemon/variant/29.json @@ -1,5 +1,5 @@ { - "0": { + "1": { "424284": "6b1524", "7384ad": "a53038", "d6d6ff": "f28566", diff --git a/public/images/pokemon/variant/_masterlist.json b/public/images/pokemon/variant/_masterlist.json index 1f8b274f51f..613ddb73e32 100644 --- a/public/images/pokemon/variant/_masterlist.json +++ b/public/images/pokemon/variant/_masterlist.json @@ -1,7 +1,7 @@ { "29": [ - 1, 0, + 1, 1 ], "30": [ @@ -2991,6 +2991,16 @@ 1, 1 ], + "306-mega": [ + 1, + 1, + 1 + ], + "308-mega": [ + 0, + 1, + 1 + ], "310-mega": [ 0, 1, @@ -3116,6 +3126,11 @@ 1, 1 ], + "747": [ + 0, + 1, + 1 + ], "748": [ 0, 1, @@ -3196,6 +3211,16 @@ 1, 1 ], + "850": [ + 0, + 1, + 1 + ], + "851": [ + 0, + 1, + 1 + ], "856": [ 0, 1, @@ -3453,6 +3478,16 @@ 1, 1 ], + "306-mega": [ + 1, + 1, + 1 + ], + "308-mega": [ + 0, + 1, + 1 + ], "310-mega": [ 0, 1, @@ -3578,6 +3613,11 @@ 1, 1 ], + "747": [ + 0, + 2, + 2 + ], "748": [ 0, 1, @@ -3658,6 +3698,16 @@ 1, 1 ], + "850": [ + 0, + 1, + 1 + ], + "851": [ + 0, + 1, + 1 + ], "856": [ 0, 1, diff --git a/public/images/pokemon/variant/exp/306-mega.json b/public/images/pokemon/variant/exp/306-mega.json new file mode 100644 index 00000000000..40575898b93 --- /dev/null +++ b/public/images/pokemon/variant/exp/306-mega.json @@ -0,0 +1,47 @@ +{ + "0": { + "000000": "101010", + "5a5a62": "4b382a", + "ffffff": "fff2e5", + "cdcdcd": "cbc4a2", + "6a6a6a": "224228", + "52524a": "15321e", + "8b8b8b": "3e6244", + "838394": "a48d76", + "a4a4ac": "bca88c", + "6abdff": "ff78fa", + "acacac": "69ad6c", + "9c3141": "9c3141", + "de5252": "de5252" + }, + "1": { + "000000": "101010", + "5a5a62": "2b265d", + "ffffff": "cdd9fa", + "cdcdcd": "91a1e3", + "6a6a6a": "6e1e26", + "52524a": "47121b", + "8b8b8b": "8b312e", + "838394": "3d3c8c", + "a4a4ac": "686dc0", + "6abdff": "ffcf47", + "acacac": "d4857c", + "9c3141": "bc2d51", + "de5252": "de5291" + }, + "2": { + "000000": "101010", + "5a5a62": "722f15", + "ffffff": "ffcc7d", + "cdcdcd": "d48e3c", + "6a6a6a": "1d365e", + "52524a": "0e213a", + "8b8b8b": "385594", + "838394": "833d19", + "a4a4ac": "a45f34", + "6abdff": "2aebcf", + "acacac": "7d95bf", + "9c3141": "9c3141", + "de5252": "de5252" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/308-mega.json b/public/images/pokemon/variant/exp/308-mega.json new file mode 100644 index 00000000000..e46ededfcd1 --- /dev/null +++ b/public/images/pokemon/variant/exp/308-mega.json @@ -0,0 +1,36 @@ +{ + "1": { + "aca4ac": "a58291", + "52414a": "432641", + "ffffff": "fff4db", + "000000": "101010", + "83414a": "59141d", + "e6738b": "a53835", + "ee9ca4": "a53835", + "b44a5a": "83272c", + "c5c5c5": "b5969a", + "a47329": "722966", + "f6de83": "ee9bd5", + "eebd5a": "ce5cb6", + "dedede": "e0cdd9", + "0a7ba2": "efa360", + "45bade": "efa360" + }, + "2": { + "aca4ac": "6c7d9e", + "52414a": "1f344a", + "ffffff": "c4dff1", + "000000": "101010", + "83414a": "461f5d", + "e6738b": "7d5187", + "ee9ca4": "7d5187", + "b44a5a": "633971", + "c5c5c5": "8aacd2", + "a47329": "205a9e", + "f6de83": "5abbef", + "eebd5a": "3a8dca", + "dedede": "c4dff1", + "0a7ba2": "3dc7b6", + "45bade": "3dc7b6" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/747.json b/public/images/pokemon/variant/exp/747.json new file mode 100644 index 00000000000..f9ed1405ec6 --- /dev/null +++ b/public/images/pokemon/variant/exp/747.json @@ -0,0 +1,30 @@ +{ + "1": { + "b67e32": "614da4", + "6f3878": "9b6459", + "f3e07c": "e3e2ff", + "b687bc": "edd5ca", + "d1ac1b": "aca5f3", + "8d5b9e": "d29784", + "070707": "101010", + "394f7e": "490a26", + "d7a8d3": "a21f90", + "6291b3": "b24b34", + "9fd5d2": "e07b53", + "ffffff": "fdfdfd" + }, + "2": { + "b67e32": "9f4354", + "6f3878": "113c3a", + "f3e07c": "ffebed", + "b687bc": "2b6157", + "d1ac1b": "efa2ad", + "8d5b9e": "1c524b", + "070707": "101010", + "394f7e": "186443", + "d7a8d3": "ff3f5a", + "6291b3": "359d5d", + "9fd5d2": "5bd97f", + "ffffff": "fdfdfd" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/850.json b/public/images/pokemon/variant/exp/850.json new file mode 100644 index 00000000000..c799fd3ac06 --- /dev/null +++ b/public/images/pokemon/variant/exp/850.json @@ -0,0 +1,32 @@ +{ + "1": { + "2f1610": "2f1610", + "804a3e": "59365d", + "bf3922": "117956", + "101010": "101010", + "ff5839": "35c36c", + "5b2f26": "36203c", + "681607": "024f2d", + "f77c42": "89fbad", + "f89e08": "67ef9c", + "ff836c": "5ff58e", + "ffd901": "c8ffcc", + "be5409": "117956", + "fbfbfb": "fbfbfb" + }, + "2": { + "2f1610": "2f1610", + "804a3e": "475294", + "bf3922": "ae1165", + "101010": "101010", + "ff5839": "d73981", + "5b2f26": "36426c", + "681607": "68063c", + "f77c42": "f77c42", + "f89e08": "f89e08", + "ff836c": "ff836c", + "ffd901": "ffc143", + "be5409": "be5409", + "fbfbfb": "fbfbfb" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/851.json b/public/images/pokemon/variant/exp/851.json new file mode 100644 index 00000000000..827ace8fc29 --- /dev/null +++ b/public/images/pokemon/variant/exp/851.json @@ -0,0 +1,36 @@ +{ + "1": { + "be5409": "017336", + "f89e08": "67ef9c", + "ffd901": "c8ffcc", + "bf3922": "1a8987", + "101010": "101010", + "2f1610": "24122b", + "5b2f26": "503154", + "804a3e": "714272", + "681607": "0a5660", + "ff5839": "35c3a8", + "b96f5d": "ad58ab", + "941528": "005f35", + "fbfbfb": "fbfbfb", + "42221c": "36203c", + "000000": "101010" + }, + "2": { + "be5409": "890f52", + "f89e08": "f36d73", + "ffd901": "ffc143", + "bf3922": "ae1165", + "101010": "101010", + "2f1610": "121439", + "5b2f26": "36426c", + "804a3e": "475294", + "681607": "6e0442", + "ff5839": "d73981", + "b96f5d": "7866cb", + "941528": "941528", + "fbfbfb": "fbfbfb", + "42221c": "222957", + "000000": "101010" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/306-mega.json b/public/images/pokemon/variant/exp/back/306-mega.json new file mode 100644 index 00000000000..1fa46dae29e --- /dev/null +++ b/public/images/pokemon/variant/exp/back/306-mega.json @@ -0,0 +1,38 @@ +{ + "0": { + "393939": "132c1b", + "000000": "101010", + "838394": "a48d76", + "6a6a6a": "325537", + "202029": "131d17", + "5a5a62": "735c4a", + "ffffff": "fff2e5", + "52524a": "224228", + "cdcdcd": "cbc4a2", + "a4a4ac": "b8a88a" + }, + "1": { + "393939": "47121b", + "000000": "101010", + "838394": "686dc0", + "6a6a6a": "8b312e", + "202029": "350a13", + "5a5a62": "374186", + "ffffff": "cdd9fa", + "52524a": "6e1e26", + "cdcdcd": "a5b7ed", + "a4a4ac": "91a1e3" + }, + "2": { + "393939": "1d365e", + "000000": "101010", + "838394": "a45f34", + "6a6a6a": "385594", + "202029": "0e213a", + "5a5a62": "7a3a1a", + "ffffff": "f1b25e", + "52524a": "385594", + "cdcdcd": "dd9f57", + "a4a4ac": "c18239" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/308-mega.json b/public/images/pokemon/variant/exp/back/308-mega.json new file mode 100644 index 00000000000..b13332e5183 --- /dev/null +++ b/public/images/pokemon/variant/exp/back/308-mega.json @@ -0,0 +1,34 @@ +{ + "1": { + "101010": "101010", + "83414a": "59141d", + "e6738b": "a53835", + "b44a5a": "83272c", + "8b838b": "5a4357", + "bdafad": "a5829d", + "52414a": "432641", + "e7e3e7": "e0cdd9", + "f9f8f7": "f9f8f7", + "a47329": "722966", + "eebd5a": "a25793", + "f6de83": "ee9bd5", + "164b5d": "a6571b", + "42a2bd": "efa360" + }, + "2": { + "101010": "101010", + "83414a": "461f5d", + "e6738b": "7d5187", + "b44a5a": "633971", + "8b838b": "445a7e", + "bdafad": "7988a6", + "52414a": "1f344a", + "e7e3e7": "abb7c6", + "f9f8f7": "c4dff1", + "a47329": "285181", + "eebd5a": "4983ad", + "f6de83": "5abbef", + "164b5d": "107270", + "42a2bd": "3dc7b6" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/747_2.json b/public/images/pokemon/variant/exp/back/747_2.json new file mode 100644 index 00000000000..7ddd3d69528 --- /dev/null +++ b/public/images/pokemon/variant/exp/back/747_2.json @@ -0,0 +1,230 @@ +{ + "textures": [ + { + "image": "747_2.png", + "format": "RGBA8888", + "size": { + "w": 147, + "h": 147 + }, + "scale": 1, + "frames": [ + { + "filename": "0005.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 62, + "h": 49 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 62, + "h": 49 + }, + "frame": { + "x": 0, + "y": 0, + "w": 62, + "h": 49 + } + }, + { + "filename": "0007.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 62, + "h": 49 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 62, + "h": 49 + }, + "frame": { + "x": 0, + "y": 0, + "w": 62, + "h": 49 + } + }, + { + "filename": "0006.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 62, + "h": 49 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 62, + "h": 49 + }, + "frame": { + "x": 62, + "y": 0, + "w": 62, + "h": 49 + } + }, + { + "filename": "0004.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 62, + "h": 49 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 61, + "h": 49 + }, + "frame": { + "x": 0, + "y": 49, + "w": 61, + "h": 49 + } + }, + { + "filename": "0008.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 62, + "h": 49 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 61, + "h": 49 + }, + "frame": { + "x": 0, + "y": 49, + "w": 61, + "h": 49 + } + }, + { + "filename": "0003.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 62, + "h": 49 + }, + "spriteSourceSize": { + "x": 1, + "y": 0, + "w": 59, + "h": 49 + }, + "frame": { + "x": 0, + "y": 98, + "w": 59, + "h": 49 + } + }, + { + "filename": "0009.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 62, + "h": 49 + }, + "spriteSourceSize": { + "x": 1, + "y": 0, + "w": 59, + "h": 49 + }, + "frame": { + "x": 0, + "y": 98, + "w": 59, + "h": 49 + } + }, + { + "filename": "0002.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 62, + "h": 49 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 57, + "h": 49 + }, + "frame": { + "x": 59, + "y": 98, + "w": 57, + "h": 49 + } + }, + { + "filename": "0010.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 62, + "h": 49 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 57, + "h": 49 + }, + "frame": { + "x": 59, + "y": 98, + "w": 57, + "h": 49 + } + }, + { + "filename": "0001.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 62, + "h": 49 + }, + "spriteSourceSize": { + "x": 3, + "y": 0, + "w": 55, + "h": 49 + }, + "frame": { + "x": 61, + "y": 49, + "w": 55, + "h": 49 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:4319e2c59a85fcb72ddcdb0b4089ac8b:29cb568870b0231298c87d5d39f7b933:b26f7254994561969f00f765318acf1c$" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/747_2.png b/public/images/pokemon/variant/exp/back/747_2.png new file mode 100644 index 00000000000..3307b34a3d0 Binary files /dev/null and b/public/images/pokemon/variant/exp/back/747_2.png differ diff --git a/public/images/pokemon/variant/exp/back/747_3.json b/public/images/pokemon/variant/exp/back/747_3.json new file mode 100644 index 00000000000..d8eb676118a --- /dev/null +++ b/public/images/pokemon/variant/exp/back/747_3.json @@ -0,0 +1,230 @@ +{ + "textures": [ + { + "image": "747_3.png", + "format": "RGBA8888", + "size": { + "w": 147, + "h": 147 + }, + "scale": 1, + "frames": [ + { + "filename": "0005.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 62, + "h": 49 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 62, + "h": 49 + }, + "frame": { + "x": 0, + "y": 0, + "w": 62, + "h": 49 + } + }, + { + "filename": "0007.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 62, + "h": 49 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 62, + "h": 49 + }, + "frame": { + "x": 0, + "y": 0, + "w": 62, + "h": 49 + } + }, + { + "filename": "0006.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 62, + "h": 49 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 62, + "h": 49 + }, + "frame": { + "x": 62, + "y": 0, + "w": 62, + "h": 49 + } + }, + { + "filename": "0004.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 62, + "h": 49 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 61, + "h": 49 + }, + "frame": { + "x": 0, + "y": 49, + "w": 61, + "h": 49 + } + }, + { + "filename": "0008.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 62, + "h": 49 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 61, + "h": 49 + }, + "frame": { + "x": 0, + "y": 49, + "w": 61, + "h": 49 + } + }, + { + "filename": "0003.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 62, + "h": 49 + }, + "spriteSourceSize": { + "x": 1, + "y": 0, + "w": 59, + "h": 49 + }, + "frame": { + "x": 0, + "y": 98, + "w": 59, + "h": 49 + } + }, + { + "filename": "0009.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 62, + "h": 49 + }, + "spriteSourceSize": { + "x": 1, + "y": 0, + "w": 59, + "h": 49 + }, + "frame": { + "x": 0, + "y": 98, + "w": 59, + "h": 49 + } + }, + { + "filename": "0002.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 62, + "h": 49 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 57, + "h": 49 + }, + "frame": { + "x": 59, + "y": 98, + "w": 57, + "h": 49 + } + }, + { + "filename": "0010.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 62, + "h": 49 + }, + "spriteSourceSize": { + "x": 2, + "y": 0, + "w": 57, + "h": 49 + }, + "frame": { + "x": 59, + "y": 98, + "w": 57, + "h": 49 + } + }, + { + "filename": "0001.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 62, + "h": 49 + }, + "spriteSourceSize": { + "x": 3, + "y": 0, + "w": 55, + "h": 49 + }, + "frame": { + "x": 61, + "y": 49, + "w": 55, + "h": 49 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:4319e2c59a85fcb72ddcdb0b4089ac8b:29cb568870b0231298c87d5d39f7b933:b26f7254994561969f00f765318acf1c$" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/747_3.png b/public/images/pokemon/variant/exp/back/747_3.png new file mode 100644 index 00000000000..d6a1d0d6b26 Binary files /dev/null and b/public/images/pokemon/variant/exp/back/747_3.png differ diff --git a/public/images/pokemon/variant/exp/back/748.json b/public/images/pokemon/variant/exp/back/748.json index 22aa3444026..7929514bcda 100644 --- a/public/images/pokemon/variant/exp/back/748.json +++ b/public/images/pokemon/variant/exp/back/748.json @@ -1,11 +1,11 @@ { "1": { - "943732": "490a3c", + "943732": "5c075b", "101010": "101010", - "f28c4f": "a21f90", - "e25025": "91138c", + "f28c4f": "c639bd", + "e25025": "a21f90", "93d1d7": "df7b52", - "3a3f6d": "462952", + "3a3f6d": "171539", "6f97c4": "be583d", "711a6a": "81463e", "455b85": "892e20", @@ -15,12 +15,12 @@ "171539": "171539" }, "2": { - "943732": "c30e49", + "943732": "ac063c", "101010": "101010", "f28c4f": "ff3f5a", "e25025": "e12350", "93d1d7": "5bd97f", - "3a3f6d": "862916", + "3a3f6d": "490c06", "6f97c4": "359d5d", "711a6a": "082b29", "455b85": "186443", diff --git a/public/images/pokemon/variant/exp/back/850.json b/public/images/pokemon/variant/exp/back/850.json new file mode 100644 index 00000000000..b5df39e115c --- /dev/null +++ b/public/images/pokemon/variant/exp/back/850.json @@ -0,0 +1,28 @@ +{ + "1": { + "bf3922": "35c3a8", + "8d3123": "178573", + "5b2f26": "59365d", + "ff5839": "79f1d2", + "804a3e": "8f4b94", + "681607": "065b58", + "42221c": "36203c", + "2f1610": "24122b", + "101010": "101010", + "be5409": "25a96a", + "f89e08": "a3ffb9" + }, + "2": { + "bf3922": "d73981", + "8d3123": "902962", + "5b2f26": "36426c", + "ff5839": "f360a3", + "804a3e": "7866cb", + "681607": "4a1036", + "42221c": "222957", + "2f1610": "121439", + "101010": "101010", + "be5409": "be5409", + "f89e08": "f89e08" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/851.json b/public/images/pokemon/variant/exp/back/851.json new file mode 100644 index 00000000000..9fca14e5e14 --- /dev/null +++ b/public/images/pokemon/variant/exp/back/851.json @@ -0,0 +1,34 @@ +{ + "1": { + "be5409": "017336", + "f89e08": "67ef9c", + "ffd901": "c8ffcc", + "5b2f26": "59365d", + "b96f5d": "d695d5", + "804a3e": "924a91", + "8d3123": "056a3b", + "bf3922": "0c8c48", + "ff5839": "35c36c", + "42221c": "36203c", + "2f1610": "24122b", + "681607": "024f2d", + "101010": "101010", + "941528": "005f35" + }, + "2": { + "be5409": "be5409", + "f89e08": "f36d73", + "ffd901": "ffc143", + "5b2f26": "36426c", + "b96f5d": "7866cb", + "804a3e": "475294", + "8d3123": "ae1165", + "bf3922": "d73981", + "ff5839": "ff6970", + "42221c": "222957", + "2f1610": "121439", + "681607": "6e0442", + "101010": "101010", + "941528": "941528" + } +} \ No newline at end of file diff --git a/public/images/pokemon_icons_1v.json b/public/images/pokemon_icons_1v.json index b0d213057b0..daa3e070e86 100644 --- a/public/images/pokemon_icons_1v.json +++ b/public/images/pokemon_icons_1v.json @@ -4,8 +4,8 @@ "image": "pokemon_icons_1v.png", "format": "RGBA8888", "size": { - "w": 276, - "h": 276 + "w": 277, + "h": 277 }, "scale": 1, "frames": [ @@ -199,7 +199,7 @@ } }, { - "filename": "29_2", + "filename": "29_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -220,7 +220,7 @@ } }, { - "filename": "29_3", + "filename": "29_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -241,7 +241,7 @@ } }, { - "filename": "35_2", + "filename": "29_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -249,7 +249,7 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, + "x": 10, "y": 8, "w": 20, "h": 21 @@ -262,7 +262,7 @@ } }, { - "filename": "35_3", + "filename": "35_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -283,7 +283,7 @@ } }, { - "filename": "123_1", + "filename": "35_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -291,15 +291,36 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, + "x": 11, "y": 8, - "w": 21, + "w": 20, "h": 21 }, "frame": { "x": 20, "y": 17, - "w": 21, + "w": 20, + "h": 21 + } + }, + { + "filename": "118_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 8, + "w": 26, + "h": 21 + }, + "frame": { + "x": 40, + "y": 20, + "w": 26, "h": 21 } }, @@ -318,7 +339,7 @@ "h": 21 }, "frame": { - "x": 41, + "x": 66, "y": 20, "w": 26, "h": 21 @@ -339,12 +360,33 @@ "h": 21 }, "frame": { - "x": 67, + "x": 92, "y": 20, "w": 26, "h": 21 } }, + { + "filename": "123_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 21, + "h": 21 + }, + "frame": { + "x": 118, + "y": 20, + "w": 21, + "h": 21 + } + }, { "filename": "123_2", "rotated": false, @@ -360,7 +402,7 @@ "h": 21 }, "frame": { - "x": 93, + "x": 139, "y": 20, "w": 21, "h": 21 @@ -381,7 +423,7 @@ "h": 21 }, "frame": { - "x": 114, + "x": 160, "y": 20, "w": 21, "h": 21 @@ -402,7 +444,7 @@ "h": 21 }, "frame": { - "x": 135, + "x": 181, "y": 20, "w": 31, "h": 21 @@ -423,8 +465,8 @@ "h": 21 }, "frame": { - "x": 166, - "y": 20, + "x": 212, + "y": 21, "w": 31, "h": 21 } @@ -444,7 +486,7 @@ "h": 21 }, "frame": { - "x": 197, + "x": 243, "y": 21, "w": 31, "h": 21 @@ -465,8 +507,8 @@ "h": 22 }, "frame": { - "x": 228, - "y": 21, + "x": 0, + "y": 38, "w": 23, "h": 22 } @@ -486,8 +528,8 @@ "h": 22 }, "frame": { - "x": 251, - "y": 21, + "x": 23, + "y": 41, "w": 23, "h": 22 } @@ -507,8 +549,8 @@ "h": 22 }, "frame": { - "x": 0, - "y": 38, + "x": 46, + "y": 41, "w": 23, "h": 22 } @@ -528,7 +570,7 @@ "h": 22 }, "frame": { - "x": 23, + "x": 69, "y": 41, "w": 24, "h": 22 @@ -549,7 +591,7 @@ "h": 22 }, "frame": { - "x": 47, + "x": 93, "y": 41, "w": 24, "h": 22 @@ -570,7 +612,7 @@ "h": 22 }, "frame": { - "x": 71, + "x": 117, "y": 41, "w": 24, "h": 22 @@ -591,7 +633,7 @@ "h": 22 }, "frame": { - "x": 95, + "x": 141, "y": 41, "w": 24, "h": 22 @@ -612,7 +654,7 @@ "h": 22 }, "frame": { - "x": 119, + "x": 165, "y": 41, "w": 24, "h": 22 @@ -633,7 +675,7 @@ "h": 22 }, "frame": { - "x": 143, + "x": 189, "y": 41, "w": 21, "h": 22 @@ -654,8 +696,8 @@ "h": 22 }, "frame": { - "x": 164, - "y": 41, + "x": 210, + "y": 42, "w": 21, "h": 22 } @@ -675,54 +717,12 @@ "h": 22 }, "frame": { - "x": 185, + "x": 231, "y": 42, "w": 21, "h": 22 } }, - { - "filename": "119_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 27, - "h": 22 - }, - "frame": { - "x": 206, - "y": 43, - "w": 27, - "h": 22 - } - }, - { - "filename": "119_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 27, - "h": 22 - }, - "frame": { - "x": 233, - "y": 43, - "w": 27, - "h": 22 - } - }, { "filename": "52_1", "rotated": false, @@ -737,6 +737,27 @@ "w": 23, "h": 23 }, + "frame": { + "x": 252, + "y": 42, + "w": 23, + "h": 23 + } + }, + { + "filename": "52_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 23, + "h": 23 + }, "frame": { "x": 0, "y": 60, @@ -745,7 +766,7 @@ } }, { - "filename": "119_3", + "filename": "119_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -765,6 +786,48 @@ "h": 22 } }, + { + "filename": "119_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 27, + "h": 22 + }, + "frame": { + "x": 50, + "y": 63, + "w": 27, + "h": 22 + } + }, + { + "filename": "119_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 27, + "h": 22 + }, + "frame": { + "x": 77, + "y": 63, + "w": 27, + "h": 22 + } + }, { "filename": "144_1", "rotated": false, @@ -780,7 +843,7 @@ "h": 22 }, "frame": { - "x": 50, + "x": 104, "y": 63, "w": 29, "h": 22 @@ -801,7 +864,7 @@ "h": 22 }, "frame": { - "x": 79, + "x": 133, "y": 63, "w": 29, "h": 22 @@ -822,33 +885,12 @@ "h": 22 }, "frame": { - "x": 108, + "x": 162, "y": 63, "w": 29, "h": 22 } }, - { - "filename": "52_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 23, - "h": 23 - }, - "frame": { - "x": 137, - "y": 63, - "w": 23, - "h": 23 - } - }, { "filename": "52_3", "rotated": false, @@ -864,30 +906,9 @@ "h": 23 }, "frame": { - "x": 160, - "y": 63, - "w": 23, - "h": 23 - } - }, - { - "filename": "135_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 22, - "h": 23 - }, - "frame": { - "x": 183, + "x": 191, "y": 64, - "w": 22, + "w": 23, "h": 23 } }, @@ -906,8 +927,8 @@ "h": 23 }, "frame": { - "x": 205, - "y": 65, + "x": 214, + "y": 64, "w": 25, "h": 23 } @@ -927,35 +948,14 @@ "h": 23 }, "frame": { - "x": 230, + "x": 239, "y": 65, "w": 25, "h": 23 } }, { - "filename": "30_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 21, - "h": 24 - }, - "frame": { - "x": 255, - "y": 65, - "w": 21, - "h": 24 - } - }, - { - "filename": "135_2", + "filename": "135_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -1075,11 +1075,32 @@ }, "frame": { "x": 124, - "y": 86, + "y": 85, "w": 25, "h": 23 } }, + { + "filename": "135_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 6, + "w": 22, + "h": 23 + }, + "frame": { + "x": 149, + "y": 85, + "w": 22, + "h": 23 + } + }, { "filename": "135_3", "rotated": false, @@ -1095,8 +1116,8 @@ "h": 23 }, "frame": { - "x": 149, - "y": 86, + "x": 171, + "y": 87, "w": 22, "h": 23 } @@ -1116,12 +1137,33 @@ "h": 23 }, "frame": { - "x": 171, + "x": 193, "y": 87, "w": 25, "h": 23 } }, + { + "filename": "30_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 21, + "h": 24 + }, + "frame": { + "x": 218, + "y": 87, + "w": 21, + "h": 24 + } + }, { "filename": "136_2", "rotated": false, @@ -1137,28 +1179,7 @@ "h": 23 }, "frame": { - "x": 196, - "y": 88, - "w": 25, - "h": 23 - } - }, - { - "filename": "136_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 25, - "h": 23 - }, - "frame": { - "x": 221, + "x": 239, "y": 88, "w": 25, "h": 23 @@ -1179,14 +1200,14 @@ "h": 24 }, "frame": { - "x": 246, - "y": 89, + "x": 0, + "y": 106, "w": 21, "h": 24 } }, { - "filename": "36_2", + "filename": "136_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -1194,16 +1215,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 22, - "h": 25 + "x": 8, + "y": 6, + "w": 25, + "h": 23 }, "frame": { - "x": 0, - "y": 106, - "w": 22, - "h": 25 + "x": 21, + "y": 108, + "w": 25, + "h": 23 } }, { @@ -1221,7 +1242,7 @@ "h": 24 }, "frame": { - "x": 22, + "x": 46, "y": 108, "w": 28, "h": 24 @@ -1242,7 +1263,7 @@ "h": 24 }, "frame": { - "x": 50, + "x": 74, "y": 108, "w": 28, "h": 24 @@ -1263,7 +1284,7 @@ "h": 24 }, "frame": { - "x": 78, + "x": 102, "y": 108, "w": 28, "h": 24 @@ -1284,8 +1305,8 @@ "h": 24 }, "frame": { - "x": 106, - "y": 109, + "x": 130, + "y": 108, "w": 24, "h": 24 } @@ -1304,27 +1325,6 @@ "w": 24, "h": 24 }, - "frame": { - "x": 130, - "y": 109, - "w": 24, - "h": 24 - } - }, - { - "filename": "47_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 24, - "h": 24 - }, "frame": { "x": 154, "y": 110, @@ -1332,6 +1332,27 @@ "h": 24 } }, + { + "filename": "47_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 24, + "h": 24 + }, + "frame": { + "x": 178, + "y": 110, + "w": 24, + "h": 24 + } + }, { "filename": "53_1", "rotated": false, @@ -1347,7 +1368,7 @@ "h": 24 }, "frame": { - "x": 178, + "x": 202, "y": 111, "w": 25, "h": 24 @@ -1368,7 +1389,7 @@ "h": 24 }, "frame": { - "x": 203, + "x": 227, "y": 111, "w": 25, "h": 24 @@ -1389,33 +1410,12 @@ "h": 24 }, "frame": { - "x": 228, - "y": 113, + "x": 252, + "y": 111, "w": 25, "h": 24 } }, - { - "filename": "36_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 22, - "h": 25 - }, - "frame": { - "x": 253, - "y": 113, - "w": 22, - "h": 25 - } - }, { "filename": "83_2", "rotated": false, @@ -1432,7 +1432,7 @@ }, "frame": { "x": 0, - "y": 132, + "y": 131, "w": 28, "h": 24 } @@ -1516,11 +1516,32 @@ }, "frame": { "x": 104, - "y": 133, + "y": 132, "w": 27, "h": 24 } }, + { + "filename": "36_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 22, + "h": 25 + }, + "frame": { + "x": 131, + "y": 132, + "w": 22, + "h": 25 + } + }, { "filename": "149_3", "rotated": false, @@ -1536,12 +1557,33 @@ "h": 24 }, "frame": { - "x": 131, + "x": 153, "y": 134, "w": 27, "h": 24 } }, + { + "filename": "36_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 22, + "h": 25 + }, + "frame": { + "x": 180, + "y": 134, + "w": 22, + "h": 25 + } + }, { "filename": "31_1", "rotated": false, @@ -1557,7 +1599,7 @@ "h": 25 }, "frame": { - "x": 158, + "x": 202, "y": 135, "w": 25, "h": 25 @@ -1578,7 +1620,7 @@ "h": 25 }, "frame": { - "x": 183, + "x": 227, "y": 135, "w": 25, "h": 25 @@ -1599,12 +1641,33 @@ "h": 25 }, "frame": { - "x": 208, - "y": 137, + "x": 252, + "y": 135, "w": 25, "h": 25 } }, + { + "filename": "77_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 26, + "h": 25 + }, + "frame": { + "x": 0, + "y": 155, + "w": 26, + "h": 25 + } + }, { "filename": "71_2", "rotated": false, @@ -1620,8 +1683,8 @@ "h": 25 }, "frame": { - "x": 233, - "y": 138, + "x": 26, + "y": 156, "w": 30, "h": 25 } @@ -1641,33 +1704,12 @@ "h": 25 }, "frame": { - "x": 0, + "x": 56, "y": 156, "w": 30, "h": 25 } }, - { - "filename": "77_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 26, - "h": 25 - }, - "frame": { - "x": 30, - "y": 156, - "w": 26, - "h": 25 - } - }, { "filename": "77_3", "rotated": false, @@ -1683,33 +1725,12 @@ "h": 25 }, "frame": { - "x": 56, + "x": 86, "y": 156, "w": 26, "h": 25 } }, - { - "filename": "150_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 22, - "h": 25 - }, - "frame": { - "x": 82, - "y": 156, - "w": 22, - "h": 25 - } - }, { "filename": "86_1", "rotated": false, @@ -1725,7 +1746,7 @@ "h": 25 }, "frame": { - "x": 104, + "x": 112, "y": 157, "w": 27, "h": 25 @@ -1746,7 +1767,7 @@ "h": 25 }, "frame": { - "x": 131, + "x": 139, "y": 158, "w": 27, "h": 25 @@ -1767,33 +1788,12 @@ "h": 25 }, "frame": { - "x": 158, - "y": 160, + "x": 166, + "y": 159, "w": 27, "h": 25 } }, - { - "filename": "150_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 22, - "h": 25 - }, - "frame": { - "x": 185, - "y": 160, - "w": 22, - "h": 25 - } - }, { "filename": "87_1", "rotated": false, @@ -1809,8 +1809,8 @@ "h": 25 }, "frame": { - "x": 207, - "y": 163, + "x": 193, + "y": 160, "w": 27, "h": 25 } @@ -1830,8 +1830,8 @@ "h": 25 }, "frame": { - "x": 234, - "y": 163, + "x": 220, + "y": 160, "w": 27, "h": 25 } @@ -1851,12 +1851,54 @@ "h": 25 }, "frame": { - "x": 0, - "y": 181, + "x": 247, + "y": 160, "w": 27, "h": 25 } }, + { + "filename": "150_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 22, + "h": 25 + }, + "frame": { + "x": 0, + "y": 180, + "w": 22, + "h": 25 + } + }, + { + "filename": "150_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 22, + "h": 25 + }, + "frame": { + "x": 22, + "y": 181, + "w": 22, + "h": 25 + } + }, { "filename": "94_1", "rotated": false, @@ -1872,7 +1914,7 @@ "h": 26 }, "frame": { - "x": 27, + "x": 44, "y": 181, "w": 26, "h": 26 @@ -1893,7 +1935,7 @@ "h": 26 }, "frame": { - "x": 53, + "x": 70, "y": 181, "w": 26, "h": 26 @@ -1914,7 +1956,7 @@ "h": 26 }, "frame": { - "x": 79, + "x": 96, "y": 182, "w": 26, "h": 26 @@ -1935,8 +1977,8 @@ "h": 27 }, "frame": { - "x": 105, - "y": 182, + "x": 122, + "y": 183, "w": 25, "h": 27 } @@ -1956,8 +1998,8 @@ "h": 27 }, "frame": { - "x": 130, - "y": 183, + "x": 147, + "y": 184, "w": 25, "h": 27 } @@ -1977,7 +2019,7 @@ "h": 28 }, "frame": { - "x": 155, + "x": 172, "y": 185, "w": 31, "h": 28 @@ -1998,8 +2040,8 @@ "h": 28 }, "frame": { - "x": 186, - "y": 188, + "x": 203, + "y": 185, "w": 31, "h": 28 } @@ -2019,54 +2061,12 @@ "h": 28 }, "frame": { - "x": 217, - "y": 188, + "x": 234, + "y": 185, "w": 32, "h": 28 } }, - { - "filename": "150-mega-x_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 1, - "w": 23, - "h": 28 - }, - "frame": { - "x": 249, - "y": 188, - "w": 23, - "h": 28 - } - }, - { - "filename": "150-mega-x_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 1, - "w": 23, - "h": 28 - }, - "frame": { - "x": 0, - "y": 206, - "w": 23, - "h": 28 - } - }, { "filename": "93_2", "rotated": false, @@ -2082,8 +2082,8 @@ "h": 28 }, "frame": { - "x": 23, - "y": 207, + "x": 0, + "y": 206, "w": 32, "h": 28 } @@ -2103,12 +2103,54 @@ "h": 28 }, "frame": { - "x": 55, - "y": 208, + "x": 32, + "y": 207, "w": 32, "h": 28 } }, + { + "filename": "150-mega-x_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 1, + "w": 23, + "h": 28 + }, + "frame": { + "x": 64, + "y": 207, + "w": 23, + "h": 28 + } + }, + { + "filename": "150-mega-x_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 1, + "w": 23, + "h": 28 + }, + "frame": { + "x": 87, + "y": 208, + "w": 23, + "h": 28 + } + }, { "filename": "131-gigantamax_2", "rotated": false, @@ -2124,28 +2166,7 @@ "h": 29 }, "frame": { - "x": 87, - "y": 209, - "w": 33, - "h": 29 - } - }, - { - "filename": "131-gigantamax_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 33, - "h": 29 - }, - "frame": { - "x": 120, + "x": 110, "y": 210, "w": 33, "h": 29 @@ -2166,12 +2187,33 @@ "h": 30 }, "frame": { - "x": 153, - "y": 213, + "x": 143, + "y": 211, "w": 25, "h": 30 } }, + { + "filename": "131-gigantamax_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 33, + "h": 29 + }, + "frame": { + "x": 168, + "y": 213, + "w": 33, + "h": 29 + } + }, { "filename": "52-gigantamax_2", "rotated": false, @@ -2187,8 +2229,8 @@ "h": 30 }, "frame": { - "x": 178, - "y": 216, + "x": 201, + "y": 213, "w": 25, "h": 30 } @@ -2208,14 +2250,14 @@ "h": 30 }, "frame": { - "x": 203, - "y": 216, + "x": 226, + "y": 213, "w": 25, "h": 30 } }, { - "filename": "94-gigantamax_1", + "filename": "150-mega-y_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -2223,20 +2265,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 3, + "x": 9, "y": 0, - "w": 34, + "w": 22, "h": 30 }, "frame": { - "x": 228, - "y": 216, - "w": 34, + "x": 251, + "y": 213, + "w": 22, "h": 30 } }, { - "filename": "150-mega-y_2", + "filename": "150-mega-y_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -2257,7 +2299,7 @@ } }, { - "filename": "150-mega-y_3", + "filename": "94-gigantamax_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -2265,15 +2307,15 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, + "x": 3, "y": 0, - "w": 22, + "w": 34, "h": 30 }, "frame": { "x": 22, "y": 235, - "w": 22, + "w": 34, "h": 30 } }, @@ -2292,7 +2334,7 @@ "h": 30 }, "frame": { - "x": 44, + "x": 56, "y": 236, "w": 34, "h": 30 @@ -2313,8 +2355,8 @@ "h": 30 }, "frame": { - "x": 78, - "y": 238, + "x": 90, + "y": 239, "w": 34, "h": 30 } @@ -2334,8 +2376,8 @@ "h": 30 }, "frame": { - "x": 112, - "y": 239, + "x": 124, + "y": 241, "w": 36, "h": 30 } @@ -2355,8 +2397,8 @@ "h": 30 }, "frame": { - "x": 148, - "y": 246, + "x": 160, + "y": 242, "w": 36, "h": 30 } @@ -2376,8 +2418,8 @@ "h": 30 }, "frame": { - "x": 184, - "y": 246, + "x": 196, + "y": 243, "w": 36, "h": 30 } @@ -2388,6 +2430,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:ff8be1f0e8905cf57ed1af85a597a5be:63904eb65167f759420c4e4a5c2dc80c:2fc2d7db306a93e9369e20846ccef45c$" + "smartupdate": "$TexturePacker:SmartUpdate:429d90e6d126fba8a16e4abf1b881671:64ab0e3b54dd7c7e4e6017f2657aa1f5:2fc2d7db306a93e9369e20846ccef45c$" } } diff --git a/public/images/pokemon_icons_1v.png b/public/images/pokemon_icons_1v.png index 508d2411b25..48eb12fe138 100644 Binary files a/public/images/pokemon_icons_1v.png and b/public/images/pokemon_icons_1v.png differ diff --git a/public/images/pokemon_icons_3v.json b/public/images/pokemon_icons_3v.json index c3b04ae5f4f..af6a027ac8a 100644 --- a/public/images/pokemon_icons_3v.json +++ b/public/images/pokemon_icons_3v.json @@ -4,8 +4,8 @@ "image": "pokemon_icons_3v.png", "format": "RGBA8888", "size": { - "w": 264, - "h": 264 + "w": 274, + "h": 274 }, "scale": 1, "frames": [ @@ -345,6 +345,27 @@ "h": 28 } }, + { + "filename": "376_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 6, + "w": 34, + "h": 24 + }, + "frame": { + "x": 0, + "y": 250, + "w": 34, + "h": 24 + } + }, { "filename": "308-mega_2", "rotated": false, @@ -451,7 +472,7 @@ } }, { - "filename": "304_1", + "filename": "351-rainy_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -459,20 +480,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 15, - "w": 18, - "h": 14 + "x": 12, + "y": 6, + "w": 16, + "h": 23 }, "frame": { - "x": 0, - "y": 250, - "w": 18, - "h": 14 + "x": 258, + "y": 0, + "w": 16, + "h": 23 } }, { - "filename": "304_2", + "filename": "351-rainy_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -480,16 +501,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 15, - "w": 18, - "h": 14 + "x": 12, + "y": 6, + "w": 16, + "h": 23 }, "frame": { - "x": 18, - "y": 250, - "w": 18, - "h": 14 + "x": 258, + "y": 23, + "w": 16, + "h": 23 } }, { @@ -514,7 +535,7 @@ } }, { - "filename": "376_2", + "filename": "376_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -535,7 +556,7 @@ } }, { - "filename": "376_3", + "filename": "321_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -543,16 +564,37 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, - "y": 6, - "w": 34, - "h": 24 + "x": 5, + "y": 4, + "w": 32, + "h": 25 }, "frame": { "x": 146, "y": 23, - "w": 34, - "h": 24 + "w": 32, + "h": 25 + } + }, + { + "filename": "321_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 4, + "w": 32, + "h": 25 + }, + "frame": { + "x": 178, + "y": 23, + "w": 32, + "h": 25 } }, { @@ -570,8 +612,8 @@ "h": 26 }, "frame": { - "x": 180, - "y": 23, + "x": 73, + "y": 49, "w": 31, "h": 26 } @@ -591,12 +633,96 @@ "h": 26 }, "frame": { - "x": 73, - "y": 49, + "x": 210, + "y": 26, "w": 31, "h": 26 } }, + { + "filename": "358_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 7, + "w": 17, + "h": 23 + }, + "frame": { + "x": 241, + "y": 26, + "w": 17, + "h": 23 + } + }, + { + "filename": "351-rainy_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 6, + "w": 16, + "h": 23 + }, + "frame": { + "x": 258, + "y": 46, + "w": 16, + "h": 23 + } + }, + { + "filename": "358_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 7, + "w": 17, + "h": 23 + }, + "frame": { + "x": 241, + "y": 49, + "w": 17, + "h": 23 + } + }, + { + "filename": "280_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 9, + "w": 16, + "h": 20 + }, + "frame": { + "x": 258, + "y": 69, + "w": 16, + "h": 20 + } + }, { "filename": "306_3", "rotated": false, @@ -612,54 +738,12 @@ "h": 26 }, "frame": { - "x": 211, - "y": 26, + "x": 73, + "y": 75, "w": 31, "h": 26 } }, - { - "filename": "334_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 22, - "h": 26 - }, - "frame": { - "x": 242, - "y": 26, - "w": 22, - "h": 26 - } - }, - { - "filename": "282-mega_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 28, - "h": 26 - }, - "frame": { - "x": 104, - "y": 49, - "w": 28, - "h": 26 - } - }, { "filename": "475-mega_3", "rotated": false, @@ -675,35 +759,14 @@ "h": 28 }, "frame": { - "x": 132, - "y": 47, + "x": 104, + "y": 49, "w": 27, "h": 28 } }, { - "filename": "308_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 2, - "w": 19, - "h": 27 - }, - "frame": { - "x": 159, - "y": 47, - "w": 19, - "h": 27 - } - }, - { - "filename": "330_2", + "filename": "282-mega_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -712,36 +775,15 @@ }, "spriteSourceSize": { "x": 7, - "y": 4, - "w": 29, - "h": 25 + "y": 3, + "w": 28, + "h": 26 }, "frame": { - "x": 178, - "y": 49, - "w": 29, - "h": 25 - } - }, - { - "filename": "330_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 29, - "h": 25 - }, - "frame": { - "x": 207, - "y": 52, - "w": 29, - "h": 25 + "x": 104, + "y": 77, + "w": 28, + "h": 26 } }, { @@ -759,54 +801,12 @@ "h": 26 }, "frame": { - "x": 236, - "y": 52, + "x": 131, + "y": 48, "w": 28, "h": 26 } }, - { - "filename": "334-mega_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 29, - "h": 25 - }, - "frame": { - "x": 73, - "y": 75, - "w": 29, - "h": 25 - } - }, - { - "filename": "334-mega_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 29, - "h": 25 - }, - "frame": { - "x": 102, - "y": 75, - "w": 29, - "h": 25 - } - }, { "filename": "282_2", "rotated": false, @@ -822,8 +822,8 @@ "h": 26 }, "frame": { - "x": 131, - "y": 75, + "x": 159, + "y": 48, "w": 28, "h": 26 } @@ -843,54 +843,12 @@ "h": 26 }, "frame": { - "x": 159, + "x": 132, "y": 74, "w": 28, "h": 26 } }, - { - "filename": "281_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 20, - "h": 25 - }, - "frame": { - "x": 187, - "y": 74, - "w": 20, - "h": 25 - } - }, - { - "filename": "375_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 29, - "h": 23 - }, - "frame": { - "x": 207, - "y": 77, - "w": 29, - "h": 23 - } - }, { "filename": "310-mega_2", "rotated": false, @@ -906,14 +864,266 @@ "h": 26 }, "frame": { - "x": 236, - "y": 78, + "x": 160, + "y": 74, "w": 28, "h": 26 } }, { - "filename": "375_3", + "filename": "334_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 22, + "h": 26 + }, + "frame": { + "x": 187, + "y": 48, + "w": 22, + "h": 26 + } + }, + { + "filename": "330_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 29, + "h": 25 + }, + "frame": { + "x": 209, + "y": 52, + "w": 29, + "h": 25 + } + }, + { + "filename": "281_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 20, + "h": 25 + }, + "frame": { + "x": 188, + "y": 74, + "w": 20, + "h": 25 + } + }, + { + "filename": "330_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 29, + "h": 25 + }, + "frame": { + "x": 208, + "y": 77, + "w": 29, + "h": 25 + } + }, + { + "filename": "281_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 20, + "h": 25 + }, + "frame": { + "x": 238, + "y": 72, + "w": 20, + "h": 25 + } + }, + { + "filename": "280_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 9, + "w": 16, + "h": 20 + }, + "frame": { + "x": 258, + "y": 89, + "w": 16, + "h": 20 + } + }, + { + "filename": "309_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 12, + "w": 21, + "h": 17 + }, + "frame": { + "x": 237, + "y": 97, + "w": 21, + "h": 17 + } + }, + { + "filename": "334-mega_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 4, + "w": 29, + "h": 25 + }, + "frame": { + "x": 132, + "y": 100, + "w": 29, + "h": 25 + } + }, + { + "filename": "310-mega_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 4, + "w": 28, + "h": 26 + }, + "frame": { + "x": 161, + "y": 100, + "w": 28, + "h": 26 + } + }, + { + "filename": "308_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 2, + "w": 19, + "h": 27 + }, + "frame": { + "x": 189, + "y": 99, + "w": 19, + "h": 27 + } + }, + { + "filename": "334-mega_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 4, + "w": 29, + "h": 25 + }, + "frame": { + "x": 208, + "y": 102, + "w": 29, + "h": 25 + } + }, + { + "filename": "263_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 11, + "w": 24, + "h": 18 + }, + "frame": { + "x": 237, + "y": 114, + "w": 24, + "h": 18 + } + }, + { + "filename": "375_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -933,153 +1143,6 @@ "h": 23 } }, - { - "filename": "310-mega_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 28, - "h": 26 - }, - "frame": { - "x": 32, - "y": 215, - "w": 28, - "h": 26 - } - }, - { - "filename": "303_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 28, - "h": 23 - }, - "frame": { - "x": 36, - "y": 241, - "w": 28, - "h": 23 - } - }, - { - "filename": "334_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 22, - "h": 26 - }, - "frame": { - "x": 60, - "y": 215, - "w": 22, - "h": 26 - } - }, - { - "filename": "303_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 28, - "h": 23 - }, - "frame": { - "x": 64, - "y": 241, - "w": 28, - "h": 23 - } - }, - { - "filename": "303_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 28, - "h": 23 - }, - "frame": { - "x": 62, - "y": 192, - "w": 28, - "h": 23 - } - }, - { - "filename": "281_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 20, - "h": 25 - }, - "frame": { - "x": 82, - "y": 215, - "w": 20, - "h": 25 - } - }, - { - "filename": "351-rainy_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 16, - "h": 23 - }, - "frame": { - "x": 92, - "y": 240, - "w": 16, - "h": 23 - } - }, { "filename": "286_2", "rotated": false, @@ -1095,8 +1158,8 @@ "h": 27 }, "frame": { - "x": 65, - "y": 106, + "x": 32, + "y": 215, "w": 25, "h": 27 } @@ -1116,14 +1179,14 @@ "h": 27 }, "frame": { - "x": 90, - "y": 100, + "x": 34, + "y": 242, "w": 25, "h": 27 } }, { - "filename": "351-rainy_2", + "filename": "308_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -1131,121 +1194,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 16, - "h": 23 + "x": 11, + "y": 2, + "w": 19, + "h": 27 }, "frame": { - "x": 115, - "y": 100, - "w": 16, - "h": 23 - } - }, - { - "filename": "329_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 27, - "h": 22 - }, - "frame": { - "x": 131, - "y": 101, - "w": 27, - "h": 22 - } - }, - { - "filename": "290_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 13, - "w": 25, - "h": 16 - }, - "frame": { - "x": 90, - "y": 127, - "w": 25, - "h": 16 - } - }, - { - "filename": "329_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 27, - "h": 22 - }, - "frame": { - "x": 115, - "y": 123, - "w": 27, - "h": 22 - } - }, - { - "filename": "264_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 24, - "h": 22 - }, - "frame": { - "x": 142, - "y": 123, - "w": 24, - "h": 22 - } - }, - { - "filename": "290_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 13, - "w": 25, - "h": 16 - }, - "frame": { - "x": 65, - "y": 133, - "w": 25, - "h": 16 + "x": 57, + "y": 215, + "w": 19, + "h": 27 } }, { @@ -1263,14 +1221,14 @@ "h": 27 }, "frame": { - "x": 64, - "y": 149, + "x": 59, + "y": 242, "w": 24, "h": 27 } }, { - "filename": "290_3", + "filename": "279_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -1279,17 +1237,290 @@ }, "spriteSourceSize": { "x": 7, - "y": 13, + "y": 6, "w": 25, + "h": 23 + }, + "frame": { + "x": 62, + "y": 192, + "w": 25, + "h": 23 + } + }, + { + "filename": "334_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 22, + "h": 26 + }, + "frame": { + "x": 76, + "y": 215, + "w": 22, + "h": 26 + } + }, + { + "filename": "310_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 22, + "h": 25 + }, + "frame": { + "x": 83, + "y": 241, + "w": 22, + "h": 25 + } + }, + { + "filename": "329_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 27, + "h": 22 + }, + "frame": { + "x": 105, + "y": 103, + "w": 27, + "h": 22 + } + }, + { + "filename": "375_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 29, + "h": 23 + }, + "frame": { + "x": 68, + "y": 101, + "w": 29, + "h": 23 + } + }, + { + "filename": "278_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 13, + "w": 28, "h": 16 }, "frame": { - "x": 64, - "y": 176, - "w": 25, + "x": 65, + "y": 124, + "w": 28, "h": 16 } }, + { + "filename": "303_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 28, + "h": 23 + }, + "frame": { + "x": 64, + "y": 140, + "w": 28, + "h": 23 + } + }, + { + "filename": "303_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 28, + "h": 23 + }, + "frame": { + "x": 64, + "y": 163, + "w": 28, + "h": 23 + } + }, + { + "filename": "278_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 13, + "w": 28, + "h": 16 + }, + "frame": { + "x": 93, + "y": 125, + "w": 28, + "h": 16 + } + }, + { + "filename": "303_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 28, + "h": 23 + }, + "frame": { + "x": 92, + "y": 141, + "w": 28, + "h": 23 + } + }, + { + "filename": "329_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 27, + "h": 22 + }, + "frame": { + "x": 92, + "y": 164, + "w": 27, + "h": 22 + } + }, + { + "filename": "278_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 13, + "w": 28, + "h": 16 + }, + "frame": { + "x": 121, + "y": 125, + "w": 28, + "h": 16 + } + }, + { + "filename": "279_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 25, + "h": 23 + }, + "frame": { + "x": 120, + "y": 141, + "w": 25, + "h": 23 + } + }, + { + "filename": "279_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 25, + "h": 23 + }, + "frame": { + "x": 119, + "y": 164, + "w": 25, + "h": 23 + } + }, { "filename": "291_1", "rotated": false, @@ -1305,8 +1536,8 @@ "h": 22 }, "frame": { - "x": 90, - "y": 143, + "x": 87, + "y": 186, "w": 25, "h": 22 } @@ -1326,12 +1557,117 @@ "h": 22 }, "frame": { - "x": 115, - "y": 145, + "x": 112, + "y": 187, "w": 25, "h": 22 } }, + { + "filename": "264_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 24, + "h": 22 + }, + "frame": { + "x": 137, + "y": 187, + "w": 24, + "h": 22 + } + }, + { + "filename": "358_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 7, + "w": 17, + "h": 23 + }, + "frame": { + "x": 144, + "y": 164, + "w": 17, + "h": 23 + } + }, + { + "filename": "320_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 9, + "w": 26, + "h": 20 + }, + "frame": { + "x": 149, + "y": 126, + "w": 26, + "h": 20 + } + }, + { + "filename": "263_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 11, + "w": 24, + "h": 18 + }, + "frame": { + "x": 145, + "y": 146, + "w": 24, + "h": 18 + } + }, + { + "filename": "320_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 9, + "w": 26, + "h": 20 + }, + "frame": { + "x": 175, + "y": 126, + "w": 26, + "h": 20 + } + }, { "filename": "291_3", "rotated": false, @@ -1347,75 +1683,12 @@ "h": 22 }, "frame": { - "x": 140, - "y": 145, + "x": 169, + "y": 146, "w": 25, "h": 22 } }, - { - "filename": "308_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 2, - "w": 19, - "h": 27 - }, - "frame": { - "x": 89, - "y": 165, - "w": 19, - "h": 27 - } - }, - { - "filename": "358_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 7, - "w": 17, - "h": 23 - }, - "frame": { - "x": 90, - "y": 192, - "w": 17, - "h": 23 - } - }, - { - "filename": "310_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 22, - "h": 25 - }, - "frame": { - "x": 108, - "y": 167, - "w": 22, - "h": 25 - } - }, { "filename": "310_3", "rotated": false, @@ -1431,8 +1704,8 @@ "h": 25 }, "frame": { - "x": 130, - "y": 167, + "x": 161, + "y": 168, "w": 22, "h": 25 } @@ -1452,33 +1725,12 @@ "h": 22 }, "frame": { - "x": 107, - "y": 192, + "x": 161, + "y": 193, "w": 24, "h": 22 } }, - { - "filename": "352_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 22, - "h": 22 - }, - "frame": { - "x": 131, - "y": 192, - "w": 22, - "h": 22 - } - }, { "filename": "351-snowy_1", "rotated": false, @@ -1494,8 +1746,8 @@ "h": 25 }, "frame": { - "x": 152, - "y": 167, + "x": 183, + "y": 168, "w": 19, "h": 25 } @@ -1515,12 +1767,54 @@ "h": 22 }, "frame": { - "x": 153, - "y": 192, + "x": 185, + "y": 193, "w": 19, "h": 22 } }, + { + "filename": "305_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 10, + "w": 25, + "h": 19 + }, + "frame": { + "x": 201, + "y": 127, + "w": 25, + "h": 19 + } + }, + { + "filename": "385_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 24, + "h": 22 + }, + "frame": { + "x": 194, + "y": 146, + "w": 24, + "h": 22 + } + }, { "filename": "351-snowy_2", "rotated": false, @@ -1536,117 +1830,12 @@ "h": 25 }, "frame": { - "x": 102, - "y": 215, + "x": 202, + "y": 168, "w": 19, "h": 25 } }, - { - "filename": "385_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 24, - "h": 22 - }, - "frame": { - "x": 121, - "y": 214, - "w": 24, - "h": 22 - } - }, - { - "filename": "385_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 24, - "h": 22 - }, - "frame": { - "x": 145, - "y": 214, - "w": 24, - "h": 22 - } - }, - { - "filename": "351-rainy_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 16, - "h": 23 - }, - "frame": { - "x": 108, - "y": 240, - "w": 16, - "h": 23 - } - }, - { - "filename": "385_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 24, - "h": 22 - }, - "frame": { - "x": 124, - "y": 236, - "w": 24, - "h": 22 - } - }, - { - "filename": "352_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 22, - "h": 22 - }, - "frame": { - "x": 148, - "y": 236, - "w": 22, - "h": 22 - } - }, { "filename": "307_3", "rotated": false, @@ -1662,12 +1851,33 @@ "h": 22 }, "frame": { - "x": 158, - "y": 101, + "x": 204, + "y": 193, "w": 19, "h": 22 } }, + { + "filename": "351-sunny_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 20, + "h": 22 + }, + "frame": { + "x": 218, + "y": 146, + "w": 20, + "h": 22 + } + }, { "filename": "351-snowy_3", "rotated": false, @@ -1683,75 +1893,12 @@ "h": 25 }, "frame": { - "x": 166, - "y": 123, + "x": 221, + "y": 168, "w": 19, "h": 25 } }, - { - "filename": "305_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 10, - "w": 25, - "h": 19 - }, - "frame": { - "x": 165, - "y": 148, - "w": 25, - "h": 19 - } - }, - { - "filename": "351-sunny_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 20, - "h": 22 - }, - "frame": { - "x": 171, - "y": 167, - "w": 20, - "h": 22 - } - }, - { - "filename": "358_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 7, - "w": 17, - "h": 23 - }, - "frame": { - "x": 177, - "y": 100, - "w": 17, - "h": 23 - } - }, { "filename": "351-sunny_2", "rotated": false, @@ -1767,14 +1914,14 @@ "h": 22 }, "frame": { - "x": 172, - "y": 189, + "x": 223, + "y": 193, "w": 20, "h": 22 } }, { - "filename": "358_3", + "filename": "304_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -1782,16 +1929,163 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 7, - "w": 17, - "h": 23 + "x": 11, + "y": 15, + "w": 18, + "h": 14 }, "frame": { - "x": 185, - "y": 123, - "w": 17, - "h": 23 + "x": 226, + "y": 132, + "w": 18, + "h": 14 + } + }, + { + "filename": "285_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 12, + "w": 20, + "h": 17 + }, + "frame": { + "x": 244, + "y": 132, + "w": 20, + "h": 17 + } + }, + { + "filename": "305_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 10, + "w": 25, + "h": 19 + }, + "frame": { + "x": 238, + "y": 149, + "w": 25, + "h": 19 + } + }, + { + "filename": "385_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 24, + "h": 22 + }, + "frame": { + "x": 240, + "y": 168, + "w": 24, + "h": 22 + } + }, + { + "filename": "352_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 22, + "h": 22 + }, + "frame": { + "x": 243, + "y": 190, + "w": 22, + "h": 22 + } + }, + { + "filename": "385_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 24, + "h": 22 + }, + "frame": { + "x": 98, + "y": 209, + "w": 24, + "h": 22 + } + }, + { + "filename": "305_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 10, + "w": 25, + "h": 19 + }, + "frame": { + "x": 122, + "y": 209, + "w": 25, + "h": 19 + } + }, + { + "filename": "351-sunny_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 20, + "h": 22 + }, + "frame": { + "x": 105, + "y": 231, + "w": 20, + "h": 22 } }, { @@ -1809,12 +2103,33 @@ "h": 21 }, "frame": { - "x": 190, - "y": 146, + "x": 105, + "y": 253, "w": 22, "h": 21 } }, + { + "filename": "352_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 22, + "h": 22 + }, + "frame": { + "x": 125, + "y": 228, + "w": 22, + "h": 22 + } + }, { "filename": "352_3", "rotated": false, @@ -1830,8 +2145,8 @@ "h": 22 }, "frame": { - "x": 191, - "y": 167, + "x": 127, + "y": 250, "w": 22, "h": 22 } @@ -1851,159 +2166,12 @@ "h": 21 }, "frame": { - "x": 192, - "y": 189, + "x": 147, + "y": 215, "w": 22, "h": 21 } }, - { - "filename": "305_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 10, - "w": 25, - "h": 19 - }, - "frame": { - "x": 194, - "y": 100, - "w": 25, - "h": 19 - } - }, - { - "filename": "280_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 9, - "w": 16, - "h": 20 - }, - "frame": { - "x": 219, - "y": 100, - "w": 16, - "h": 20 - } - }, - { - "filename": "305_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 10, - "w": 25, - "h": 19 - }, - "frame": { - "x": 235, - "y": 104, - "w": 25, - "h": 19 - } - }, - { - "filename": "351_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 7, - "w": 15, - "h": 22 - }, - "frame": { - "x": 202, - "y": 119, - "w": 15, - "h": 22 - } - }, - { - "filename": "280_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 9, - "w": 16, - "h": 20 - }, - "frame": { - "x": 217, - "y": 120, - "w": 16, - "h": 20 - } - }, - { - "filename": "263_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 11, - "w": 24, - "h": 18 - }, - "frame": { - "x": 233, - "y": 123, - "w": 24, - "h": 18 - } - }, - { - "filename": "351-sunny_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 20, - "h": 22 - }, - "frame": { - "x": 169, - "y": 214, - "w": 20, - "h": 22 - } - }, { "filename": "292_3", "rotated": false, @@ -2019,33 +2187,12 @@ "h": 21 }, "frame": { - "x": 170, - "y": 236, + "x": 169, + "y": 215, "w": 22, "h": 21 } }, - { - "filename": "263_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 11, - "w": 24, - "h": 18 - }, - "frame": { - "x": 192, - "y": 210, - "w": 24, - "h": 18 - } - }, { "filename": "328_2", "rotated": false, @@ -2061,33 +2208,12 @@ "h": 21 }, "frame": { - "x": 192, - "y": 228, + "x": 191, + "y": 215, "w": 21, "h": 21 } }, - { - "filename": "304_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 15, - "w": 18, - "h": 14 - }, - "frame": { - "x": 192, - "y": 249, - "w": 18, - "h": 14 - } - }, { "filename": "328_3", "rotated": false, @@ -2103,12 +2229,96 @@ "h": 21 }, "frame": { - "x": 213, - "y": 228, + "x": 212, + "y": 215, "w": 21, "h": 21 } }, + { + "filename": "304_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 15, + "w": 18, + "h": 14 + }, + "frame": { + "x": 147, + "y": 236, + "w": 18, + "h": 14 + } + }, + { + "filename": "290_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 13, + "w": 25, + "h": 16 + }, + "frame": { + "x": 165, + "y": 236, + "w": 25, + "h": 16 + } + }, + { + "filename": "290_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 13, + "w": 25, + "h": 16 + }, + "frame": { + "x": 190, + "y": 236, + "w": 25, + "h": 16 + } + }, + { + "filename": "351_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 7, + "w": 15, + "h": 22 + }, + "frame": { + "x": 149, + "y": 250, + "w": 15, + "h": 22 + } + }, { "filename": "351_3", "rotated": false, @@ -2124,12 +2334,54 @@ "h": 22 }, "frame": { - "x": 212, - "y": 141, + "x": 164, + "y": 252, "w": 15, "h": 22 } }, + { + "filename": "290_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 13, + "w": 25, + "h": 16 + }, + "frame": { + "x": 179, + "y": 252, + "w": 25, + "h": 16 + } + }, + { + "filename": "285_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 12, + "w": 20, + "h": 17 + }, + "frame": { + "x": 215, + "y": 236, + "w": 20, + "h": 17 + } + }, { "filename": "374_2", "rotated": false, @@ -2145,8 +2397,8 @@ "h": 19 }, "frame": { - "x": 227, - "y": 141, + "x": 233, + "y": 215, "w": 21, "h": 19 } @@ -2166,12 +2418,33 @@ "h": 19 }, "frame": { - "x": 213, - "y": 163, + "x": 235, + "y": 234, "w": 21, "h": 19 } }, + { + "filename": "309_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 12, + "w": 21, + "h": 17 + }, + "frame": { + "x": 204, + "y": 253, + "w": 21, + "h": 17 + } + }, { "filename": "333_2", "rotated": false, @@ -2187,8 +2460,8 @@ "h": 18 }, "frame": { - "x": 214, - "y": 182, + "x": 225, + "y": 253, "w": 21, "h": 18 } @@ -2208,14 +2481,14 @@ "h": 18 }, "frame": { - "x": 234, - "y": 160, + "x": 246, + "y": 253, "w": 21, "h": 18 } }, { - "filename": "285_2", + "filename": "304_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -2223,79 +2496,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 12, - "w": 20, - "h": 17 + "x": 11, + "y": 15, + "w": 18, + "h": 14 }, "frame": { - "x": 235, - "y": 178, - "w": 20, - "h": 17 - } - }, - { - "filename": "285_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 12, - "w": 20, - "h": 17 - }, - "frame": { - "x": 216, - "y": 200, - "w": 20, - "h": 17 - } - }, - { - "filename": "309_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 12, - "w": 21, - "h": 17 - }, - "frame": { - "x": 236, - "y": 195, - "w": 21, - "h": 17 - } - }, - { - "filename": "309_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 12, - "w": 21, - "h": 17 - }, - "frame": { - "x": 236, + "x": 256, "y": 212, - "w": 21, - "h": 17 + "w": 18, + "h": 14 } } ] @@ -2304,6 +2514,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:1d5a45dd6af00e9ce100072d2cdd8e0b:9b35c744f171ab066952e4db2a5fb647:039b026190bf1878996b3e03190bcdf3$" + "smartupdate": "$TexturePacker:SmartUpdate:e451b3ae25328f4f0164e64e2faa5df4:c4df08d9a082c9097775d80382fd25da:039b026190bf1878996b3e03190bcdf3$" } } diff --git a/public/images/pokemon_icons_3v.png b/public/images/pokemon_icons_3v.png index 98e7c1a3b01..d21f9052426 100644 Binary files a/public/images/pokemon_icons_3v.png and b/public/images/pokemon_icons_3v.png differ diff --git a/public/images/pokemon_icons_4v.json b/public/images/pokemon_icons_4v.json index cbf00598f4e..bd10e099a3f 100644 --- a/public/images/pokemon_icons_4v.json +++ b/public/images/pokemon_icons_4v.json @@ -4,8 +4,8 @@ "image": "pokemon_icons_4v.png", "format": "RGBA8888", "size": { - "w": 239, - "h": 239 + "w": 242, + "h": 242 }, "scale": 1, "frames": [ @@ -198,6 +198,48 @@ "h": 26 } }, + { + "filename": "485_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 7, + "w": 35, + "h": 22 + }, + "frame": { + "x": 132, + "y": 0, + "w": 35, + "h": 22 + } + }, + { + "filename": "485_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 7, + "w": 35, + "h": 22 + }, + "frame": { + "x": 167, + "y": 0, + "w": 35, + "h": 22 + } + }, { "filename": "487-origin_2", "rotated": false, @@ -261,48 +303,6 @@ "h": 24 } }, - { - "filename": "445_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 31, - "h": 24 - }, - "frame": { - "x": 132, - "y": 0, - "w": 31, - "h": 24 - } - }, - { - "filename": "445_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 31, - "h": 24 - }, - "frame": { - "x": 163, - "y": 0, - "w": 31, - "h": 24 - } - }, { "filename": "475-mega_2", "rotated": false, @@ -324,27 +324,6 @@ "h": 28 } }, - { - "filename": "481_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 31, - "h": 24 - }, - "frame": { - "x": 194, - "y": 0, - "w": 31, - "h": 24 - } - }, { "filename": "488_2", "rotated": false, @@ -367,7 +346,7 @@ } }, { - "filename": "481_2", + "filename": "447_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -375,7 +354,70 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, + "x": 11, + "y": 9, + "w": 20, + "h": 20 + }, + "frame": { + "x": 0, + "y": 222, + "w": 20, + "h": 20 + } + }, + { + "filename": "445_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 31, + "h": 24 + }, + "frame": { + "x": 202, + "y": 0, + "w": 31, + "h": 24 + } + }, + { + "filename": "447_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 9, + "w": 20, + "h": 20 + }, + "frame": { + "x": 20, + "y": 222, + "w": 20, + "h": 20 + } + }, + { + "filename": "445_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, "y": 5, "w": 31, "h": 24 @@ -388,7 +430,7 @@ } }, { - "filename": "481_3", + "filename": "481_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -408,6 +450,69 @@ "h": 24 } }, + { + "filename": "481_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 31, + "h": 24 + }, + "frame": { + "x": 32, + "y": 76, + "w": 31, + "h": 24 + } + }, + { + "filename": "481_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 31, + "h": 24 + }, + "frame": { + "x": 63, + "y": 76, + "w": 31, + "h": 24 + } + }, + { + "filename": "468_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 30, + "h": 21 + }, + "frame": { + "x": 32, + "y": 100, + "w": 30, + "h": 21 + } + }, { "filename": "488_3", "rotated": false, @@ -423,12 +528,33 @@ "h": 28 }, "frame": { - "x": 32, - "y": 76, + "x": 30, + "y": 121, "w": 27, "h": 28 } }, + { + "filename": "468_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 30, + "h": 21 + }, + "frame": { + "x": 62, + "y": 100, + "w": 30, + "h": 21 + } + }, { "filename": "471_1", "rotated": false, @@ -444,8 +570,8 @@ "h": 25 }, "frame": { - "x": 59, - "y": 76, + "x": 57, + "y": 121, "w": 29, "h": 25 } @@ -465,8 +591,8 @@ "h": 24 }, "frame": { - "x": 32, - "y": 104, + "x": 30, + "y": 149, "w": 28, "h": 24 } @@ -485,72 +611,9 @@ "w": 29, "h": 25 }, - "frame": { - "x": 30, - "y": 128, - "w": 29, - "h": 25 - } - }, - { - "filename": "482_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 28, - "h": 26 - }, - "frame": { - "x": 60, - "y": 101, - "w": 28, - "h": 26 - } - }, - { - "filename": "468_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 30, - "h": 21 - }, - "frame": { - "x": 30, - "y": 153, - "w": 30, - "h": 21 - } - }, - { - "filename": "471_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 29, - "h": 25 - }, "frame": { "x": 27, - "y": 174, + "y": 173, "w": 29, "h": 25 } @@ -571,11 +634,53 @@ }, "frame": { "x": 27, - "y": 199, + "y": 198, "w": 28, "h": 24 } }, + { + "filename": "447_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 9, + "w": 20, + "h": 20 + }, + "frame": { + "x": 40, + "y": 222, + "w": 20, + "h": 20 + } + }, + { + "filename": "482_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 28, + "h": 26 + }, + "frame": { + "x": 58, + "y": 146, + "w": 28, + "h": 26 + } + }, { "filename": "429_1", "rotated": false, @@ -591,8 +696,8 @@ "h": 29 }, "frame": { - "x": 88, - "y": 76, + "x": 86, + "y": 121, "w": 21, "h": 29 } @@ -612,12 +717,33 @@ "h": 24 }, "frame": { - "x": 95, - "y": 52, + "x": 86, + "y": 150, "w": 24, "h": 24 } }, + { + "filename": "433_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 25, + "h": 21 + }, + "frame": { + "x": 92, + "y": 100, + "w": 25, + "h": 21 + } + }, { "filename": "400_3", "rotated": false, @@ -633,12 +759,33 @@ "h": 24 }, "frame": { - "x": 88, - "y": 105, + "x": 94, + "y": 76, "w": 24, "h": 24 } }, + { + "filename": "470_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 27, + "h": 24 + }, + "frame": { + "x": 95, + "y": 52, + "w": 27, + "h": 24 + } + }, { "filename": "429_2", "rotated": false, @@ -654,8 +801,8 @@ "h": 29 }, "frame": { - "x": 109, - "y": 76, + "x": 107, + "y": 121, "w": 21, "h": 29 } @@ -675,14 +822,14 @@ "h": 26 }, "frame": { - "x": 119, - "y": 50, + "x": 110, + "y": 150, "w": 26, "h": 26 } }, { - "filename": "429_3", + "filename": "468_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -690,16 +837,37 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 21, - "h": 29 + "x": 6, + "y": 6, + "w": 30, + "h": 21 }, "frame": { - "x": 130, - "y": 76, - "w": 21, - "h": 29 + "x": 132, + "y": 22, + "w": 30, + "h": 21 + } + }, + { + "filename": "471_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 4, + "w": 29, + "h": 25 + }, + "frame": { + "x": 162, + "y": 22, + "w": 29, + "h": 25 } }, { @@ -717,91 +885,7 @@ "h": 24 }, "frame": { - "x": 112, - "y": 105, - "w": 28, - "h": 24 - } - }, - { - "filename": "482_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 28, - "h": 26 - }, - "frame": { - "x": 132, - "y": 24, - "w": 28, - "h": 26 - } - }, - { - "filename": "482_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 28, - "h": 26 - }, - "frame": { - "x": 160, - "y": 24, - "w": 28, - "h": 26 - } - }, - { - "filename": "426_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 26, - "h": 26 - }, - "frame": { - "x": 145, - "y": 50, - "w": 26, - "h": 26 - } - }, - { - "filename": "480_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 28, - "h": 24 - }, - "frame": { - "x": 188, + "x": 191, "y": 24, "w": 28, "h": 24 @@ -822,14 +906,14 @@ "h": 24 }, "frame": { - "x": 216, + "x": 219, "y": 24, "w": 23, "h": 24 } }, { - "filename": "475_2", + "filename": "480_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -838,36 +922,15 @@ }, "spriteSourceSize": { "x": 9, - "y": 2, - "w": 24, - "h": 27 + "y": 5, + "w": 28, + "h": 24 }, "frame": { - "x": 151, - "y": 76, - "w": 24, - "h": 27 - } - }, - { - "filename": "448-mega_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 3, - "w": 21, - "h": 26 - }, - "frame": { - "x": 171, - "y": 50, - "w": 21, - "h": 26 + "x": 131, + "y": 43, + "w": 28, + "h": 24 } }, { @@ -885,14 +948,14 @@ "h": 24 }, "frame": { - "x": 192, - "y": 48, + "x": 159, + "y": 47, "w": 28, "h": 24 } }, { - "filename": "448-mega_2", + "filename": "482_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -900,100 +963,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, + "x": 9, "y": 3, - "w": 21, + "w": 28, "h": 26 }, "frame": { - "x": 175, - "y": 76, - "w": 21, - "h": 26 - } - }, - { - "filename": "470_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 27, - "h": 24 - }, - "frame": { - "x": 196, - "y": 72, - "w": 27, - "h": 24 - } - }, - { - "filename": "425_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 17, - "h": 24 - }, - "frame": { - "x": 220, + "x": 187, "y": 48, - "w": 17, - "h": 24 - } - }, - { - "filename": "440_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 16, - "h": 21 - }, - "frame": { - "x": 223, - "y": 72, - "w": 16, - "h": 21 - } - }, - { - "filename": "440_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 16, - "h": 21 - }, - "frame": { - "x": 223, - "y": 93, - "w": 16, - "h": 21 + "w": 28, + "h": 26 } }, { @@ -1011,75 +990,12 @@ "h": 24 }, "frame": { - "x": 196, - "y": 96, + "x": 215, + "y": 48, "w": 27, "h": 24 } }, - { - "filename": "440_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 16, - "h": 21 - }, - "frame": { - "x": 223, - "y": 114, - "w": 16, - "h": 21 - } - }, - { - "filename": "443_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 21, - "h": 21 - }, - "frame": { - "x": 175, - "y": 102, - "w": 21, - "h": 21 - } - }, - { - "filename": "490_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 24, - "h": 22 - }, - "frame": { - "x": 151, - "y": 103, - "w": 24, - "h": 22 - } - }, { "filename": "470_3", "rotated": false, @@ -1095,35 +1011,14 @@ "h": 24 }, "frame": { - "x": 196, - "y": 120, + "x": 215, + "y": 72, "w": 27, "h": 24 } }, { - "filename": "443_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 21, - "h": 21 - }, - "frame": { - "x": 175, - "y": 123, - "w": 21, - "h": 21 - } - }, - { - "filename": "448-mega_3", + "filename": "433_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -1132,14 +1027,119 @@ }, "spriteSourceSize": { "x": 11, - "y": 3, + "y": 8, + "w": 25, + "h": 21 + }, + "frame": { + "x": 117, + "y": 100, + "w": 25, + "h": 21 + } + }, + { + "filename": "429_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 1, "w": 21, + "h": 29 + }, + "frame": { + "x": 128, + "y": 121, + "w": 21, + "h": 29 + } + }, + { + "filename": "492-sky_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 23, + "h": 24 + }, + "frame": { + "x": 118, + "y": 76, + "w": 23, + "h": 24 + } + }, + { + "filename": "426_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 26, "h": 26 }, "frame": { - "x": 56, - "y": 174, - "w": 21, + "x": 136, + "y": 150, + "w": 26, + "h": 26 + } + }, + { + "filename": "448_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 18, + "h": 23 + }, + "frame": { + "x": 141, + "y": 67, + "w": 18, + "h": 23 + } + }, + { + "filename": "482_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 28, + "h": 26 + }, + "frame": { + "x": 159, + "y": 71, + "w": 28, "h": 26 } }, @@ -1158,14 +1158,14 @@ "h": 23 }, "frame": { - "x": 55, - "y": 200, + "x": 187, + "y": 74, "w": 25, "h": 23 } }, { - "filename": "433_1", + "filename": "425_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -1173,41 +1173,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 25, - "h": 21 - }, - "frame": { - "x": 60, - "y": 127, - "w": 25, - "h": 21 - } - }, - { - "filename": "468_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, + "x": 12, "y": 6, - "w": 30, - "h": 21 + "w": 17, + "h": 24 }, "frame": { - "x": 85, - "y": 129, - "w": 30, - "h": 21 + "x": 142, + "y": 90, + "w": 17, + "h": 24 } }, { - "filename": "433_2", + "filename": "433_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -1221,8 +1200,8 @@ "h": 21 }, "frame": { - "x": 115, - "y": 129, + "x": 159, + "y": 97, "w": 25, "h": 21 } @@ -1242,14 +1221,14 @@ "h": 23 }, "frame": { - "x": 60, - "y": 148, + "x": 184, + "y": 97, "w": 25, "h": 23 } }, { - "filename": "468_3", + "filename": "475_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -1257,37 +1236,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 30, - "h": 21 + "x": 9, + "y": 2, + "w": 24, + "h": 27 }, "frame": { - "x": 85, - "y": 150, - "w": 30, - "h": 21 - } - }, - { - "filename": "433_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 25, - "h": 21 - }, - "frame": { - "x": 115, - "y": 150, - "w": 25, - "h": 21 + "x": 149, + "y": 118, + "w": 24, + "h": 27 } }, { @@ -1305,138 +1263,12 @@ "h": 23 }, "frame": { - "x": 77, - "y": 171, + "x": 173, + "y": 120, "w": 25, "h": 23 } }, - { - "filename": "490_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 24, - "h": 22 - }, - "frame": { - "x": 102, - "y": 171, - "w": 24, - "h": 22 - } - }, - { - "filename": "492-sky_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 23, - "h": 24 - }, - "frame": { - "x": 80, - "y": 194, - "w": 23, - "h": 24 - } - }, - { - "filename": "443_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 21, - "h": 21 - }, - "frame": { - "x": 80, - "y": 218, - "w": 21, - "h": 21 - } - }, - { - "filename": "442_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 23, - "h": 22 - }, - "frame": { - "x": 103, - "y": 193, - "w": 23, - "h": 22 - } - }, - { - "filename": "427_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 20, - "h": 24 - }, - "frame": { - "x": 103, - "y": 215, - "w": 20, - "h": 24 - } - }, - { - "filename": "427_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 20, - "h": 24 - }, - "frame": { - "x": 123, - "y": 215, - "w": 20, - "h": 24 - } - }, { "filename": "425_3", "rotated": false, @@ -1452,14 +1284,14 @@ "h": 24 }, "frame": { - "x": 126, - "y": 171, + "x": 198, + "y": 120, "w": 17, "h": 24 } }, { - "filename": "447_1", + "filename": "448-mega_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -1468,120 +1300,15 @@ }, "spriteSourceSize": { "x": 11, - "y": 9, - "w": 20, - "h": 20 + "y": 3, + "w": 21, + "h": 26 }, "frame": { - "x": 126, - "y": 195, - "w": 20, - "h": 20 - } - }, - { - "filename": "494_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 20, - "h": 24 - }, - "frame": { - "x": 143, - "y": 215, - "w": 20, - "h": 24 - } - }, - { - "filename": "490_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 24, - "h": 22 - }, - "frame": { - "x": 140, - "y": 125, - "w": 24, - "h": 22 - } - }, - { - "filename": "494_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 20, - "h": 24 - }, - "frame": { - "x": 140, - "y": 147, - "w": 20, - "h": 24 - } - }, - { - "filename": "448_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 18, - "h": 23 - }, - "frame": { - "x": 143, - "y": 171, - "w": 18, - "h": 23 - } - }, - { - "filename": "447_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 20, - "h": 20 - }, - "frame": { - "x": 146, - "y": 194, - "w": 20, - "h": 20 + "x": 162, + "y": 145, + "w": 21, + "h": 26 } }, { @@ -1599,14 +1326,14 @@ "h": 23 }, "frame": { - "x": 160, - "y": 147, + "x": 209, + "y": 97, "w": 18, "h": 23 } }, { - "filename": "442_3", + "filename": "427_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -1614,15 +1341,141 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, + "x": 11, + "y": 5, + "w": 20, + "h": 24 + }, + "frame": { + "x": 215, + "y": 120, + "w": 20, + "h": 24 + } + }, + { + "filename": "448-mega_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 3, + "w": 21, + "h": 26 + }, + "frame": { + "x": 183, + "y": 144, + "w": 21, + "h": 26 + } + }, + { + "filename": "448-mega_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 3, + "w": 21, + "h": 26 + }, + "frame": { + "x": 204, + "y": 144, + "w": 21, + "h": 26 + } + }, + { + "filename": "440_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 8, + "w": 16, + "h": 21 + }, + "frame": { + "x": 225, + "y": 144, + "w": 16, + "h": 21 + } + }, + { + "filename": "427_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 20, + "h": 24 + }, + "frame": { + "x": 55, + "y": 198, + "w": 20, + "h": 24 + } + }, + { + "filename": "494_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 20, + "h": 24 + }, + "frame": { + "x": 56, + "y": 174, + "w": 20, + "h": 24 + } + }, + { + "filename": "490_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, "y": 7, - "w": 23, + "w": 24, "h": 22 }, "frame": { - "x": 178, - "y": 144, - "w": 23, + "x": 76, + "y": 174, + "w": 24, "h": 22 } }, @@ -1641,50 +1494,8 @@ "h": 19 }, "frame": { - "x": 201, - "y": 144, - "w": 22, - "h": 19 - } - }, - { - "filename": "448_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 18, - "h": 23 - }, - "frame": { - "x": 161, - "y": 170, - "w": 18, - "h": 23 - } - }, - { - "filename": "458_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 9, - "w": 22, - "h": 19 - }, - "frame": { - "x": 179, - "y": 166, + "x": 60, + "y": 222, "w": 22, "h": 19 } @@ -1704,33 +1515,12 @@ "h": 19 }, "frame": { - "x": 201, - "y": 163, + "x": 100, + "y": 176, "w": 25, "h": 19 } }, - { - "filename": "447_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 20, - "h": 20 - }, - "frame": { - "x": 166, - "y": 193, - "w": 20, - "h": 20 - } - }, { "filename": "489_2", "rotated": false, @@ -1746,12 +1536,138 @@ "h": 19 }, "frame": { - "x": 201, - "y": 182, + "x": 125, + "y": 176, "w": 25, "h": 19 } }, + { + "filename": "494_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 20, + "h": 24 + }, + "frame": { + "x": 75, + "y": 198, + "w": 20, + "h": 24 + } + }, + { + "filename": "458_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 9, + "w": 22, + "h": 19 + }, + "frame": { + "x": 82, + "y": 222, + "w": 22, + "h": 19 + } + }, + { + "filename": "440_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 8, + "w": 16, + "h": 21 + }, + "frame": { + "x": 150, + "y": 176, + "w": 16, + "h": 21 + } + }, + { + "filename": "448_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 18, + "h": 23 + }, + "frame": { + "x": 166, + "y": 171, + "w": 18, + "h": 23 + } + }, + { + "filename": "490_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 24, + "h": 22 + }, + "frame": { + "x": 184, + "y": 170, + "w": 24, + "h": 22 + } + }, + { + "filename": "442_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 23, + "h": 22 + }, + "frame": { + "x": 208, + "y": 170, + "w": 23, + "h": 22 + } + }, { "filename": "489_3", "rotated": false, @@ -1767,12 +1683,117 @@ "h": 19 }, "frame": { - "x": 186, - "y": 201, + "x": 184, + "y": 192, "w": 25, "h": 19 } }, + { + "filename": "442_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 23, + "h": 22 + }, + "frame": { + "x": 209, + "y": 192, + "w": 23, + "h": 22 + } + }, + { + "filename": "490_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 24, + "h": 22 + }, + "frame": { + "x": 100, + "y": 195, + "w": 24, + "h": 22 + } + }, + { + "filename": "443_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 21, + "h": 21 + }, + "frame": { + "x": 124, + "y": 195, + "w": 21, + "h": 21 + } + }, + { + "filename": "443_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 21, + "h": 21 + }, + "frame": { + "x": 104, + "y": 217, + "w": 21, + "h": 21 + } + }, + { + "filename": "443_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 21, + "h": 21 + }, + "frame": { + "x": 125, + "y": 216, + "w": 21, + "h": 21 + } + }, { "filename": "399_2", "rotated": false, @@ -1788,33 +1809,12 @@ "h": 18 }, "frame": { - "x": 211, - "y": 201, + "x": 145, + "y": 197, "w": 22, "h": 18 } }, - { - "filename": "492-land_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 11, - "w": 20, - "h": 18 - }, - "frame": { - "x": 166, - "y": 213, - "w": 20, - "h": 18 - } - }, { "filename": "399_3", "rotated": false, @@ -1830,12 +1830,54 @@ "h": 18 }, "frame": { - "x": 186, - "y": 220, + "x": 146, + "y": 215, "w": 22, "h": 18 } }, + { + "filename": "440_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 8, + "w": 16, + "h": 21 + }, + "frame": { + "x": 167, + "y": 194, + "w": 16, + "h": 21 + } + }, + { + "filename": "492-land_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 11, + "w": 20, + "h": 18 + }, + "frame": { + "x": 168, + "y": 215, + "w": 20, + "h": 18 + } + }, { "filename": "492-land_3", "rotated": false, @@ -1851,8 +1893,8 @@ "h": 18 }, "frame": { - "x": 211, - "y": 219, + "x": 188, + "y": 211, "w": 20, "h": 18 } @@ -1863,6 +1905,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:4b63c5647394176b03a33faa1261b5ce:a9e8c9029ae919f3288c88e736961ac4:ebc3f8ec5b2480b298192d752b6e57dc$" + "smartupdate": "$TexturePacker:SmartUpdate:cc5ef470e30914396d6fe36e218a5c9b:1eba0f8c1334e76461b01e852656e0cf:ebc3f8ec5b2480b298192d752b6e57dc$" } } diff --git a/public/images/pokemon_icons_4v.png b/public/images/pokemon_icons_4v.png index ec441236ca7..274a8a4978e 100644 Binary files a/public/images/pokemon_icons_4v.png and b/public/images/pokemon_icons_4v.png differ diff --git a/public/images/pokemon_icons_5v.json b/public/images/pokemon_icons_5v.json index 4091d35277b..557aae7e1b5 100644 --- a/public/images/pokemon_icons_5v.json +++ b/public/images/pokemon_icons_5v.json @@ -4,8 +4,8 @@ "image": "pokemon_icons_5v.png", "format": "RGBA8888", "size": { - "w": 219, - "h": 219 + "w": 237, + "h": 237 }, "scale": 1, "frames": [ @@ -241,7 +241,7 @@ } }, { - "filename": "560_1", + "filename": "609_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -249,16 +249,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 22, - "h": 23 + "x": 5, + "y": 4, + "w": 31, + "h": 25 }, "frame": { "x": 197, "y": 0, - "w": 22, - "h": 23 + "w": 31, + "h": 25 } }, { @@ -283,7 +283,7 @@ } }, { - "filename": "571_2", + "filename": "533_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -291,20 +291,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 31, - "h": 24 + "x": 7, + "y": 3, + "w": 29, + "h": 26 }, "frame": { "x": 0, "y": 195, - "w": 31, - "h": 24 + "w": 29, + "h": 26 } }, { - "filename": "560_2", + "filename": "546_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -313,40 +313,19 @@ }, "spriteSourceSize": { "x": 9, - "y": 6, - "w": 22, - "h": 23 + "y": 13, + "w": 23, + "h": 16 }, "frame": { - "x": 197, - "y": 23, - "w": 22, - "h": 23 + "x": 0, + "y": 221, + "w": 23, + "h": 16 } }, { - "filename": "571_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 31, - "h": 24 - }, - "frame": { - "x": 166, - "y": 25, - "w": 31, - "h": 24 - } - }, - { - "filename": "560_3", + "filename": "546_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -355,15 +334,15 @@ }, "spriteSourceSize": { "x": 9, - "y": 6, - "w": 22, - "h": 23 + "y": 13, + "w": 23, + "h": 16 }, "frame": { - "x": 197, - "y": 46, - "w": 22, - "h": 23 + "x": 23, + "y": 221, + "w": 23, + "h": 16 } }, { @@ -423,14 +402,14 @@ "h": 23 }, "frame": { - "x": 33, - "y": 28, + "x": 166, + "y": 25, "w": 32, "h": 23 } }, { - "filename": "609_3", + "filename": "571_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -439,19 +418,19 @@ }, "spriteSourceSize": { "x": 5, - "y": 4, + "y": 5, "w": 31, - "h": 25 + "h": 24 }, "frame": { - "x": 32, - "y": 51, + "x": 198, + "y": 25, "w": 31, - "h": 25 + "h": 24 } }, { - "filename": "533_3", + "filename": "571_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -459,16 +438,37 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 29, - "h": 26 + "x": 5, + "y": 5, + "w": 31, + "h": 24 }, "frame": { - "x": 32, - "y": 76, - "w": 29, - "h": 26 + "x": 33, + "y": 28, + "w": 31, + "h": 24 + } + }, + { + "filename": "593_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 30, + "h": 24 + }, + "frame": { + "x": 64, + "y": 28, + "w": 30, + "h": 24 } }, { @@ -487,13 +487,13 @@ }, "frame": { "x": 32, - "y": 102, + "y": 52, "w": 27, "h": 27 } }, { - "filename": "538_2", + "filename": "593_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -502,36 +502,15 @@ }, "spriteSourceSize": { "x": 5, - "y": 7, + "y": 5, "w": 30, - "h": 22 + "h": 24 }, "frame": { - "x": 65, - "y": 28, + "x": 59, + "y": 52, "w": 30, - "h": 22 - } - }, - { - "filename": "538_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 7, - "w": 30, - "h": 22 - }, - "frame": { - "x": 32, - "y": 129, - "w": 30, - "h": 22 + "h": 24 } }, { @@ -549,54 +528,12 @@ "h": 26 }, "frame": { - "x": 29, - "y": 151, + "x": 32, + "y": 79, "w": 25, "h": 26 } }, - { - "filename": "562_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 11, - "w": 24, - "h": 18 - }, - "frame": { - "x": 29, - "y": 177, - "w": 24, - "h": 18 - } - }, - { - "filename": "547_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 23, - "h": 24 - }, - "frame": { - "x": 31, - "y": 195, - "w": 23, - "h": 24 - } - }, { "filename": "586-summer_1", "rotated": false, @@ -612,14 +549,14 @@ "h": 26 }, "frame": { - "x": 54, - "y": 151, + "x": 32, + "y": 105, "w": 25, "h": 26 } }, { - "filename": "562_3", + "filename": "532_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -627,20 +564,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 11, - "w": 24, - "h": 18 + "x": 7, + "y": 8, + "w": 26, + "h": 21 }, "frame": { - "x": 53, - "y": 177, - "w": 24, - "h": 18 + "x": 32, + "y": 131, + "w": 26, + "h": 21 } }, { - "filename": "547_3", + "filename": "593-f_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -648,15 +585,120 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, + "x": 6, "y": 5, - "w": 23, + "w": 29, "h": 24 }, "frame": { - "x": 54, - "y": 195, - "w": 23, + "x": 29, + "y": 152, + "w": 29, + "h": 24 + } + }, + { + "filename": "593-f_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 29, + "h": 24 + }, + "frame": { + "x": 29, + "y": 176, + "w": 29, + "h": 24 + } + }, + { + "filename": "532_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 8, + "w": 26, + "h": 21 + }, + "frame": { + "x": 29, + "y": 200, + "w": 26, + "h": 21 + } + }, + { + "filename": "577_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 13, + "w": 17, + "h": 16 + }, + "frame": { + "x": 46, + "y": 221, + "w": 17, + "h": 16 + } + }, + { + "filename": "538_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 7, + "w": 30, + "h": 22 + }, + "frame": { + "x": 59, + "y": 76, + "w": 30, + "h": 22 + } + }, + { + "filename": "593-f_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 29, + "h": 24 + }, + "frame": { + "x": 57, + "y": 98, + "w": 29, "h": 24 } }, @@ -675,8 +717,8 @@ "h": 26 }, "frame": { - "x": 61, - "y": 76, + "x": 58, + "y": 122, "w": 25, "h": 26 } @@ -696,33 +738,12 @@ "h": 26 }, "frame": { - "x": 59, - "y": 102, + "x": 58, + "y": 148, "w": 24, "h": 26 } }, - { - "filename": "549_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 23 - }, - "frame": { - "x": 62, - "y": 128, - "w": 19, - "h": 23 - } - }, { "filename": "649-burn_3", "rotated": false, @@ -738,12 +759,54 @@ "h": 26 }, "frame": { - "x": 65, - "y": 50, + "x": 58, + "y": 174, "w": 24, "h": 26 } }, + { + "filename": "572_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 8, + "w": 24, + "h": 21 + }, + "frame": { + "x": 55, + "y": 200, + "w": 24, + "h": 21 + } + }, + { + "filename": "577_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 13, + "w": 17, + "h": 16 + }, + "frame": { + "x": 63, + "y": 221, + "w": 17, + "h": 16 + } + }, { "filename": "649-chill_2", "rotated": false, @@ -760,11 +823,95 @@ }, "frame": { "x": 89, - "y": 50, + "y": 52, "w": 24, "h": 26 } }, + { + "filename": "538_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 7, + "w": 30, + "h": 22 + }, + "frame": { + "x": 113, + "y": 49, + "w": 30, + "h": 22 + } + }, + { + "filename": "572_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 8, + "w": 24, + "h": 21 + }, + "frame": { + "x": 89, + "y": 78, + "w": 24, + "h": 21 + } + }, + { + "filename": "620_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 27, + "h": 24 + }, + "frame": { + "x": 113, + "y": 71, + "w": 27, + "h": 24 + } + }, + { + "filename": "620_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 27, + "h": 24 + }, + "frame": { + "x": 86, + "y": 99, + "w": 27, + "h": 24 + } + }, { "filename": "649-chill_3", "rotated": false, @@ -780,8 +927,8 @@ "h": 26 }, "frame": { - "x": 86, - "y": 76, + "x": 113, + "y": 95, "w": 24, "h": 26 } @@ -802,7 +949,7 @@ }, "frame": { "x": 83, - "y": 102, + "y": 123, "w": 24, "h": 26 } @@ -822,8 +969,8 @@ "h": 26 }, "frame": { - "x": 113, - "y": 49, + "x": 82, + "y": 149, "w": 24, "h": 26 } @@ -843,12 +990,33 @@ "h": 26 }, "frame": { - "x": 137, - "y": 49, + "x": 82, + "y": 175, "w": 24, "h": 26 } }, + { + "filename": "547_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 23, + "h": 24 + }, + "frame": { + "x": 143, + "y": 49, + "w": 23, + "h": 24 + } + }, { "filename": "649-shock_3", "rotated": false, @@ -864,33 +1032,12 @@ "h": 26 }, "frame": { - "x": 161, - "y": 49, + "x": 166, + "y": 48, "w": 24, "h": 26 } }, - { - "filename": "532_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 8, - "w": 26, - "h": 21 - }, - "frame": { - "x": 81, - "y": 128, - "w": 26, - "h": 21 - } - }, { "filename": "649_2", "rotated": false, @@ -906,8 +1053,8 @@ "h": 26 }, "frame": { - "x": 110, - "y": 76, + "x": 140, + "y": 73, "w": 24, "h": 26 } @@ -927,35 +1074,14 @@ "h": 26 }, "frame": { - "x": 107, - "y": 102, + "x": 164, + "y": 74, "w": 24, "h": 26 } }, { - "filename": "532_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 8, - "w": 26, - "h": 21 - }, - "frame": { - "x": 134, - "y": 75, - "w": 26, - "h": 21 - } - }, - { - "filename": "572_2", + "filename": "547_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -964,19 +1090,19 @@ }, "spriteSourceSize": { "x": 8, - "y": 8, - "w": 24, - "h": 21 + "y": 5, + "w": 23, + "h": 24 }, "frame": { - "x": 107, - "y": 128, - "w": 24, - "h": 21 + "x": 137, + "y": 99, + "w": 23, + "h": 24 } }, { - "filename": "572_3", + "filename": "560_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -984,41 +1110,41 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 24, - "h": 21 + "x": 9, + "y": 6, + "w": 22, + "h": 23 }, "frame": { "x": 160, - "y": 75, + "y": 100, + "w": 22, + "h": 23 + } + }, + { + "filename": "562_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 11, "w": 24, - "h": 21 - } - }, - { - "filename": "546_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 13, - "w": 23, - "h": 16 + "h": 18 }, "frame": { - "x": 134, - "y": 96, - "w": 23, - "h": 16 + "x": 79, + "y": 201, + "w": 24, + "h": 18 } }, { - "filename": "585-autumn_1", + "filename": "562_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -1026,83 +1152,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 20, - "h": 24 - }, - "frame": { - "x": 131, - "y": 112, - "w": 20, - "h": 24 - } - }, - { - "filename": "546_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 13, - "w": 23, - "h": 16 - }, - "frame": { - "x": 157, - "y": 96, - "w": 23, - "h": 16 - } - }, - { - "filename": "585-spring_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 20, - "h": 24 - }, - "frame": { - "x": 151, - "y": 112, - "w": 20, - "h": 24 - } - }, - { - "filename": "541_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, + "x": 8, "y": 11, - "w": 22, + "w": 24, "h": 18 }, "frame": { - "x": 131, - "y": 136, - "w": 22, + "x": 80, + "y": 219, + "w": 24, "h": 18 } }, { - "filename": "541_3", + "filename": "560_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -1111,19 +1174,19 @@ }, "spriteSourceSize": { "x": 9, - "y": 11, + "y": 6, "w": 22, - "h": 18 + "h": 23 }, "frame": { - "x": 153, - "y": 136, + "x": 190, + "y": 49, "w": 22, - "h": 18 + "h": 23 } }, { - "filename": "585-summer_1", + "filename": "549_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -1131,79 +1194,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 20, - "h": 24 + "x": 10, + "y": 6, + "w": 19, + "h": 23 }, "frame": { - "x": 171, - "y": 112, - "w": 20, - "h": 24 - } - }, - { - "filename": "540_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 10, - "w": 17, - "h": 19 - }, - "frame": { - "x": 175, - "y": 136, - "w": 17, - "h": 19 - } - }, - { - "filename": "577_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 13, - "w": 17, - "h": 16 - }, - "frame": { - "x": 180, - "y": 96, - "w": 17, - "h": 16 - } - }, - { - "filename": "578_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 18, - "h": 21 - }, - "frame": { - "x": 184, - "y": 75, - "w": 18, - "h": 21 + "x": 212, + "y": 49, + "w": 19, + "h": 23 } }, { @@ -1221,12 +1221,117 @@ "h": 25 }, "frame": { - "x": 202, - "y": 69, + "x": 107, + "y": 123, "w": 17, "h": 25 } }, + { + "filename": "560_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 6, + "w": 22, + "h": 23 + }, + "frame": { + "x": 124, + "y": 123, + "w": 22, + "h": 23 + } + }, + { + "filename": "585-autumn_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 20, + "h": 24 + }, + "frame": { + "x": 146, + "y": 123, + "w": 20, + "h": 24 + } + }, + { + "filename": "585-spring_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 20, + "h": 24 + }, + "frame": { + "x": 166, + "y": 123, + "w": 20, + "h": 24 + } + }, + { + "filename": "542_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 6, + "w": 16, + "h": 23 + }, + "frame": { + "x": 182, + "y": 100, + "w": 16, + "h": 23 + } + }, + { + "filename": "585-summer_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 20, + "h": 24 + }, + "frame": { + "x": 186, + "y": 123, + "w": 20, + "h": 24 + } + }, { "filename": "648-pirouette_3", "rotated": false, @@ -1242,8 +1347,8 @@ "h": 25 }, "frame": { - "x": 202, - "y": 94, + "x": 188, + "y": 74, "w": 17, "h": 25 } @@ -1263,14 +1368,14 @@ "h": 24 }, "frame": { - "x": 77, - "y": 177, + "x": 205, + "y": 72, "w": 20, "h": 24 } }, { - "filename": "559_1", + "filename": "542_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -1279,15 +1384,15 @@ }, "spriteSourceSize": { "x": 12, - "y": 11, - "w": 17, - "h": 18 + "y": 6, + "w": 16, + "h": 23 }, "frame": { - "x": 77, - "y": 201, - "w": 17, - "h": 18 + "x": 198, + "y": 99, + "w": 16, + "h": 23 } }, { @@ -1305,14 +1410,14 @@ "h": 23 }, "frame": { - "x": 79, - "y": 154, + "x": 214, + "y": 96, "w": 19, "h": 23 } }, { - "filename": "559_2", + "filename": "648-aria_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -1321,17 +1426,311 @@ }, "spriteSourceSize": { "x": 12, + "y": 6, + "w": 16, + "h": 23 + }, + "frame": { + "x": 206, + "y": 122, + "w": 16, + "h": 23 + } + }, + { + "filename": "607_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 9, + "w": 15, + "h": 20 + }, + "frame": { + "x": 222, + "y": 119, + "w": 15, + "h": 20 + } + }, + { + "filename": "607_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 9, + "w": 15, + "h": 20 + }, + "frame": { + "x": 222, + "y": 139, + "w": 15, + "h": 20 + } + }, + { + "filename": "648-aria_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 6, + "w": 16, + "h": 23 + }, + "frame": { + "x": 206, + "y": 145, + "w": 16, + "h": 23 + } + }, + { + "filename": "541_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, "y": 11, - "w": 17, + "w": 22, "h": 18 }, "frame": { - "x": 94, - "y": 201, - "w": 17, + "x": 124, + "y": 146, + "w": 22, "h": 18 } }, + { + "filename": "541_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 11, + "w": 22, + "h": 18 + }, + "frame": { + "x": 146, + "y": 147, + "w": 22, + "h": 18 + } + }, + { + "filename": "592-f_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 21, + "h": 22 + }, + "frame": { + "x": 168, + "y": 147, + "w": 21, + "h": 22 + } + }, + { + "filename": "540_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 10, + "w": 17, + "h": 19 + }, + "frame": { + "x": 189, + "y": 147, + "w": 17, + "h": 19 + } + }, + { + "filename": "578_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 18, + "h": 21 + }, + "frame": { + "x": 106, + "y": 149, + "w": 18, + "h": 21 + } + }, + { + "filename": "592-f_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 21, + "h": 22 + }, + "frame": { + "x": 106, + "y": 170, + "w": 21, + "h": 22 + } + }, + { + "filename": "578_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 18, + "h": 21 + }, + "frame": { + "x": 127, + "y": 164, + "w": 18, + "h": 21 + } + }, + { + "filename": "592-f_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 21, + "h": 22 + }, + "frame": { + "x": 145, + "y": 165, + "w": 21, + "h": 22 + } + }, + { + "filename": "592_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 21, + "h": 22 + }, + "frame": { + "x": 166, + "y": 169, + "w": 21, + "h": 22 + } + }, + { + "filename": "592_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 21, + "h": 22 + }, + "frame": { + "x": 106, + "y": 192, + "w": 21, + "h": 22 + } + }, + { + "filename": "578_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 18, + "h": 21 + }, + "frame": { + "x": 127, + "y": 185, + "w": 18, + "h": 21 + } + }, { "filename": "608_2", "rotated": false, @@ -1347,8 +1746,8 @@ "h": 20 }, "frame": { - "x": 98, - "y": 149, + "x": 145, + "y": 187, "w": 21, "h": 20 } @@ -1368,56 +1767,14 @@ "h": 20 }, "frame": { - "x": 98, - "y": 169, + "x": 166, + "y": 191, "w": 21, "h": 20 } }, { - "filename": "542_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 16, - "h": 23 - }, - "frame": { - "x": 119, - "y": 154, - "w": 16, - "h": 23 - } - }, - { - "filename": "542_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 16, - "h": 23 - }, - "frame": { - "x": 135, - "y": 154, - "w": 16, - "h": 23 - } - }, - { - "filename": "578_2", + "filename": "619_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -1427,34 +1784,13 @@ "spriteSourceSize": { "x": 11, "y": 8, - "w": 18, + "w": 20, "h": 21 }, "frame": { - "x": 151, - "y": 154, - "w": 18, - "h": 21 - } - }, - { - "filename": "578_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 18, - "h": 21 - }, - "frame": { - "x": 169, - "y": 155, - "w": 18, + "x": 104, + "y": 214, + "w": 20, "h": 21 } }, @@ -1473,14 +1809,14 @@ "h": 19 }, "frame": { - "x": 119, - "y": 177, + "x": 127, + "y": 206, "w": 18, "h": 19 } }, { - "filename": "648-aria_2", + "filename": "619_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -1488,79 +1824,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 16, - "h": 23 + "x": 11, + "y": 8, + "w": 20, + "h": 21 }, "frame": { - "x": 111, - "y": 196, - "w": 16, - "h": 23 - } - }, - { - "filename": "648-aria_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 16, - "h": 23 - }, - "frame": { - "x": 127, - "y": 196, - "w": 16, - "h": 23 - } - }, - { - "filename": "540_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 10, - "w": 17, - "h": 19 - }, - "frame": { - "x": 137, - "y": 177, - "w": 17, - "h": 19 - } - }, - { - "filename": "607_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 9, - "w": 15, - "h": 20 - }, - "frame": { - "x": 154, - "y": 175, - "w": 15, - "h": 20 + "x": 145, + "y": 207, + "w": 20, + "h": 21 } }, { @@ -1578,12 +1851,33 @@ "h": 19 }, "frame": { - "x": 169, - "y": 176, + "x": 165, + "y": 211, "w": 18, "h": 19 } }, + { + "filename": "540_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 10, + "w": 17, + "h": 19 + }, + "frame": { + "x": 183, + "y": 211, + "w": 17, + "h": 19 + } + }, { "filename": "548_1", "rotated": false, @@ -1599,33 +1893,12 @@ "h": 20 }, "frame": { - "x": 143, - "y": 196, + "x": 222, + "y": 159, "w": 14, "h": 20 } }, - { - "filename": "559_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 11, - "w": 17, - "h": 18 - }, - "frame": { - "x": 157, - "y": 195, - "w": 17, - "h": 18 - } - }, { "filename": "548_2", "rotated": false, @@ -1641,8 +1914,8 @@ "h": 20 }, "frame": { - "x": 174, - "y": 195, + "x": 187, + "y": 169, "w": 14, "h": 20 } @@ -1663,34 +1936,13 @@ }, "frame": { "x": 187, - "y": 155, + "y": 189, "w": 14, "h": 20 } }, { - "filename": "607_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 9, - "w": 15, - "h": 20 - }, - "frame": { - "x": 187, - "y": 175, - "w": 15, - "h": 20 - } - }, - { - "filename": "577_2", + "filename": "559_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -1699,15 +1951,57 @@ }, "spriteSourceSize": { "x": 12, - "y": 13, + "y": 11, "w": 17, - "h": 16 + "h": 18 }, "frame": { - "x": 202, - "y": 119, + "x": 201, + "y": 168, "w": 17, - "h": 16 + "h": 18 + } + }, + { + "filename": "559_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 11, + "w": 17, + "h": 18 + }, + "frame": { + "x": 201, + "y": 186, + "w": 17, + "h": 18 + } + }, + { + "filename": "559_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 11, + "w": 17, + "h": 18 + }, + "frame": { + "x": 218, + "y": 179, + "w": 17, + "h": 18 } }, { @@ -1725,8 +2019,8 @@ "h": 16 }, "frame": { - "x": 202, - "y": 135, + "x": 218, + "y": 197, "w": 17, "h": 16 } @@ -1737,6 +2031,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:6a72d905f49c2e6c5a2043fc04e736e5:9d034b1095aa7c830432005b7740f0b5:f1931bc28ee7f32dba7543723757cf2a$" + "smartupdate": "$TexturePacker:SmartUpdate:c76d37eea220913a090b0aaebeba0416:dac99d4c8e287d30b7d345500e57da65:f1931bc28ee7f32dba7543723757cf2a$" } } diff --git a/public/images/pokemon_icons_5v.png b/public/images/pokemon_icons_5v.png index 0aa10cec795..c688b3e8069 100644 Binary files a/public/images/pokemon_icons_5v.png and b/public/images/pokemon_icons_5v.png differ diff --git a/public/images/pokemon_icons_8v.json b/public/images/pokemon_icons_8v.json index 0f1b8c30a1c..f4af38d82aa 100644 --- a/public/images/pokemon_icons_8v.json +++ b/public/images/pokemon_icons_8v.json @@ -4,8 +4,8 @@ "image": "pokemon_icons_8v.png", "format": "RGBA8888", "size": { - "w": 196, - "h": 196 + "w": 203, + "h": 203 }, "scale": 1, "frames": [ @@ -44,11 +44,53 @@ "w": 40, "h": 30 }, + "frame": { + "x": 0, + "y": 30, + "w": 40, + "h": 30 + } + }, + { + "filename": "851_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 39, + "h": 30 + }, "frame": { "x": 40, "y": 0, + "w": 39, + "h": 30 + } + }, + { + "filename": "851_3", + "rotated": false, + "trimmed": true, + "sourceSize": { "w": 40, "h": 30 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 39, + "h": 30 + }, + "frame": { + "x": 0, + "y": 60, + "w": 39, + "h": 30 } }, { @@ -66,8 +108,8 @@ "h": 30 }, "frame": { - "x": 80, - "y": 0, + "x": 40, + "y": 30, "w": 35, "h": 30 } @@ -87,7 +129,7 @@ "h": 30 }, "frame": { - "x": 115, + "x": 79, "y": 0, "w": 35, "h": 30 @@ -108,8 +150,8 @@ "h": 30 }, "frame": { - "x": 150, - "y": 0, + "x": 0, + "y": 90, "w": 31, "h": 30 } @@ -129,8 +171,8 @@ "h": 30 }, "frame": { - "x": 0, - "y": 30, + "x": 39, + "y": 60, "w": 31, "h": 30 } @@ -150,8 +192,8 @@ "h": 28 }, "frame": { - "x": 0, - "y": 60, + "x": 75, + "y": 30, "w": 32, "h": 28 } @@ -171,8 +213,8 @@ "h": 28 }, "frame": { - "x": 31, - "y": 30, + "x": 114, + "y": 0, "w": 32, "h": 28 } @@ -192,8 +234,8 @@ "h": 28 }, "frame": { - "x": 0, - "y": 88, + "x": 31, + "y": 90, "w": 32, "h": 28 } @@ -214,7 +256,7 @@ }, "frame": { "x": 0, - "y": 116, + "y": 120, "w": 28, "h": 27 } @@ -234,117 +276,12 @@ "h": 27 }, "frame": { - "x": 0, - "y": 143, + "x": 146, + "y": 0, "w": 28, "h": 27 } }, - { - "filename": "886_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 28, - "h": 26 - }, - "frame": { - "x": 0, - "y": 170, - "w": 28, - "h": 26 - } - }, - { - "filename": "900_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 27, - "h": 27 - }, - "frame": { - "x": 28, - "y": 116, - "w": 27, - "h": 27 - } - }, - { - "filename": "900_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 27, - "h": 27 - }, - "frame": { - "x": 28, - "y": 143, - "w": 27, - "h": 27 - } - }, - { - "filename": "886_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 28, - "h": 26 - }, - "frame": { - "x": 28, - "y": 170, - "w": 28, - "h": 26 - } - }, - { - "filename": "886_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 28, - "h": 26 - }, - "frame": { - "x": 32, - "y": 58, - "w": 28, - "h": 26 - } - }, { "filename": "4078_2", "rotated": false, @@ -360,8 +297,8 @@ "h": 25 }, "frame": { - "x": 32, - "y": 84, + "x": 174, + "y": 0, "w": 29, "h": 25 } @@ -381,14 +318,14 @@ "h": 25 }, "frame": { - "x": 60, - "y": 58, + "x": 174, + "y": 25, "w": 29, "h": 25 } }, { - "filename": "6571_2", + "filename": "886_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -397,19 +334,19 @@ }, "spriteSourceSize": { "x": 6, - "y": 4, - "w": 27, - "h": 25 + "y": 2, + "w": 28, + "h": 26 }, "frame": { - "x": 63, - "y": 30, - "w": 27, - "h": 25 + "x": 0, + "y": 147, + "w": 28, + "h": 26 } }, { - "filename": "6571_3", + "filename": "886_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -418,19 +355,19 @@ }, "spriteSourceSize": { "x": 6, - "y": 4, - "w": 27, - "h": 25 + "y": 2, + "w": 28, + "h": 26 }, "frame": { - "x": 55, - "y": 109, - "w": 27, - "h": 25 + "x": 0, + "y": 173, + "w": 28, + "h": 26 } }, { - "filename": "873_1", + "filename": "886_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -439,15 +376,15 @@ }, "spriteSourceSize": { "x": 6, - "y": 3, - "w": 27, - "h": 24 + "y": 2, + "w": 28, + "h": 26 }, "frame": { - "x": 61, - "y": 83, - "w": 27, - "h": 24 + "x": 146, + "y": 27, + "w": 28, + "h": 26 } }, { @@ -465,8 +402,8 @@ "h": 27 }, "frame": { - "x": 55, - "y": 134, + "x": 63, + "y": 90, "w": 24, "h": 27 } @@ -486,14 +423,14 @@ "h": 27 }, "frame": { - "x": 56, - "y": 161, + "x": 107, + "y": 30, "w": 24, "h": 27 } }, { - "filename": "873_2", + "filename": "900_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -502,19 +439,19 @@ }, "spriteSourceSize": { "x": 6, - "y": 3, + "y": 2, "w": 27, - "h": 24 + "h": 27 }, "frame": { - "x": 79, - "y": 134, + "x": 70, + "y": 60, "w": 27, - "h": 24 + "h": 27 } }, { - "filename": "873_3", + "filename": "900_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -523,204 +460,15 @@ }, "spriteSourceSize": { "x": 6, - "y": 3, + "y": 2, "w": 27, - "h": 24 + "h": 27 }, "frame": { - "x": 82, - "y": 107, + "x": 97, + "y": 58, "w": 27, - "h": 24 - } - }, - { - "filename": "4077_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 26, - "h": 23 - }, - "frame": { - "x": 88, - "y": 83, - "w": 26, - "h": 23 - } - }, - { - "filename": "4077_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 26, - "h": 23 - }, - "frame": { - "x": 89, - "y": 55, - "w": 26, - "h": 23 - } - }, - { - "filename": "857_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 24, - "h": 24 - }, - "frame": { - "x": 90, - "y": 30, - "w": 24, - "h": 24 - } - }, - { - "filename": "857_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 24, - "h": 24 - }, - "frame": { - "x": 114, - "y": 30, - "w": 24, - "h": 24 - } - }, - { - "filename": "4264_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 24, - "h": 22 - }, - "frame": { - "x": 80, - "y": 158, - "w": 24, - "h": 22 - } - }, - { - "filename": "872_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 19, - "h": 16 - }, - "frame": { - "x": 80, - "y": 180, - "w": 19, - "h": 16 - } - }, - { - "filename": "872_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 19, - "h": 16 - }, - "frame": { - "x": 99, - "y": 180, - "w": 19, - "h": 16 - } - }, - { - "filename": "4264_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 24, - "h": 22 - }, - "frame": { - "x": 104, - "y": 158, - "w": 24, - "h": 22 - } - }, - { - "filename": "872_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 19, - "h": 16 - }, - "frame": { - "x": 118, - "y": 180, - "w": 19, - "h": 16 + "h": 27 } }, { @@ -738,8 +486,8 @@ "h": 25 }, "frame": { - "x": 106, - "y": 131, + "x": 87, + "y": 87, "w": 21, "h": 25 } @@ -759,8 +507,8 @@ "h": 25 }, "frame": { - "x": 109, - "y": 106, + "x": 108, + "y": 85, "w": 21, "h": 25 } @@ -780,14 +528,14 @@ "h": 25 }, "frame": { - "x": 127, - "y": 131, + "x": 124, + "y": 57, "w": 21, "h": 25 } }, { - "filename": "885_1", + "filename": "6571_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -795,37 +543,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 26, - "h": 19 + "x": 6, + "y": 4, + "w": 27, + "h": 25 }, "frame": { - "x": 128, - "y": 156, - "w": 26, - "h": 19 - } - }, - { - "filename": "885_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 26, - "h": 19 - }, - "frame": { - "x": 137, - "y": 175, - "w": 26, - "h": 19 + "x": 145, + "y": 53, + "w": 27, + "h": 25 } }, { @@ -843,14 +570,77 @@ "h": 25 }, "frame": { - "x": 114, - "y": 78, + "x": 129, + "y": 82, "w": 21, "h": 25 } }, { - "filename": "885_3", + "filename": "6571_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 4, + "w": 27, + "h": 25 + }, + "frame": { + "x": 150, + "y": 78, + "w": 27, + "h": 25 + } + }, + { + "filename": "4077_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 26, + "h": 23 + }, + "frame": { + "x": 177, + "y": 50, + "w": 26, + "h": 23 + } + }, + { + "filename": "4077_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 26, + "h": 23 + }, + "frame": { + "x": 177, + "y": 73, + "w": 26, + "h": 23 + } + }, + { + "filename": "885_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -864,14 +654,14 @@ "h": 19 }, "frame": { - "x": 130, - "y": 103, + "x": 177, + "y": 96, "w": 26, "h": 19 } }, { - "filename": "6570_2", + "filename": "873_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -879,20 +669,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 20, + "x": 6, + "y": 3, + "w": 27, "h": 24 }, "frame": { - "x": 148, - "y": 122, - "w": 20, + "x": 150, + "y": 103, + "w": 27, "h": 24 } }, { - "filename": "6570_3", + "filename": "885_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -900,18 +690,144 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, + "x": 7, "y": 5, - "w": 20, + "w": 26, + "h": 19 + }, + "frame": { + "x": 177, + "y": 115, + "w": 26, + "h": 19 + } + }, + { + "filename": "873_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 27, "h": 24 }, "frame": { - "x": 154, - "y": 146, - "w": 20, + "x": 31, + "y": 118, + "w": 27, "h": 24 } }, + { + "filename": "873_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 27, + "h": 24 + }, + "frame": { + "x": 28, + "y": 142, + "w": 27, + "h": 24 + } + }, + { + "filename": "857_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 24, + "h": 24 + }, + "frame": { + "x": 28, + "y": 166, + "w": 24, + "h": 24 + } + }, + { + "filename": "850_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 9, + "w": 23, + "h": 12 + }, + "frame": { + "x": 28, + "y": 190, + "w": 23, + "h": 12 + } + }, + { + "filename": "857_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 24, + "h": 24 + }, + "frame": { + "x": 58, + "y": 118, + "w": 24, + "h": 24 + } + }, + { + "filename": "4264_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 24, + "h": 22 + }, + "frame": { + "x": 55, + "y": 142, + "w": 24, + "h": 22 + } + }, { "filename": "6549_2", "rotated": false, @@ -927,203 +843,35 @@ "h": 25 }, "frame": { - "x": 163, - "y": 170, - "w": 18, - "h": 25 - } - }, - { - "filename": "877-hangry_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 23 - }, - "frame": { - "x": 115, - "y": 54, - "w": 19, - "h": 23 - } - }, - { - "filename": "877-hangry_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 23 - }, - "frame": { - "x": 134, - "y": 54, - "w": 19, - "h": 23 - } - }, - { - "filename": "877-hangry_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 23 - }, - "frame": { - "x": 138, - "y": 30, - "w": 19, - "h": 23 - } - }, - { - "filename": "6549_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 18, - "h": 25 - }, - "frame": { - "x": 135, - "y": 77, - "w": 18, - "h": 25 - } - }, - { - "filename": "877_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 23 - }, - "frame": { - "x": 153, - "y": 53, - "w": 19, - "h": 23 - } - }, - { - "filename": "877_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 23 - }, - "frame": { - "x": 157, - "y": 30, - "w": 19, - "h": 23 - } - }, - { - "filename": "877_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 23 - }, - "frame": { - "x": 153, - "y": 76, - "w": 19, - "h": 23 - } - }, - { - "filename": "4263_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 24, - "h": 18 - }, - "frame": { - "x": 156, - "y": 99, - "w": 24, - "h": 18 - } - }, - { - "filename": "4263_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 24, - "h": 18 - }, - "frame": { - "x": 168, + "x": 82, "y": 117, + "w": 18, + "h": 25 + } + }, + { + "filename": "4264_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, "w": 24, - "h": 18 + "h": 22 + }, + "frame": { + "x": 79, + "y": 142, + "w": 24, + "h": 22 } }, { - "filename": "6705_2", + "filename": "885_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -1131,37 +879,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, + "x": 7, "y": 5, - "w": 17, - "h": 24 + "w": 26, + "h": 19 }, "frame": { - "x": 174, - "y": 135, - "w": 17, - "h": 24 - } - }, - { - "filename": "6705_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 5, - "w": 17, - "h": 24 - }, - "frame": { - "x": 172, - "y": 53, - "w": 17, - "h": 24 + "x": 55, + "y": 164, + "w": 26, + "h": 19 } }, { @@ -1179,8 +906,8 @@ "h": 20 }, "frame": { - "x": 176, - "y": 30, + "x": 52, + "y": 183, "w": 19, "h": 20 } @@ -1200,11 +927,368 @@ "h": 20 }, "frame": { - "x": 172, - "y": 77, + "x": 71, + "y": 183, "w": 19, "h": 20 } + }, + { + "filename": "4263_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 24, + "h": 18 + }, + "frame": { + "x": 81, + "y": 164, + "w": 24, + "h": 18 + } + }, + { + "filename": "4263_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 24, + "h": 18 + }, + "frame": { + "x": 90, + "y": 182, + "w": 24, + "h": 18 + } + }, + { + "filename": "6549_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 18, + "h": 25 + }, + "frame": { + "x": 100, + "y": 112, + "w": 18, + "h": 25 + } + }, + { + "filename": "6570_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 20, + "h": 24 + }, + "frame": { + "x": 103, + "y": 137, + "w": 20, + "h": 24 + } + }, + { + "filename": "6570_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 20, + "h": 24 + }, + "frame": { + "x": 118, + "y": 110, + "w": 20, + "h": 24 + } + }, + { + "filename": "6705_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 5, + "w": 17, + "h": 24 + }, + "frame": { + "x": 123, + "y": 134, + "w": 17, + "h": 24 + } + }, + { + "filename": "872_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 19, + "h": 16 + }, + "frame": { + "x": 105, + "y": 161, + "w": 19, + "h": 16 + } + }, + { + "filename": "877-hangry_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 124, + "y": 158, + "w": 19, + "h": 23 + } + }, + { + "filename": "6705_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 5, + "w": 17, + "h": 24 + }, + "frame": { + "x": 140, + "y": 134, + "w": 17, + "h": 24 + } + }, + { + "filename": "877-hangry_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 143, + "y": 158, + "w": 19, + "h": 23 + } + }, + { + "filename": "877-hangry_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 157, + "y": 127, + "w": 19, + "h": 23 + } + }, + { + "filename": "850_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 9, + "w": 23, + "h": 12 + }, + "frame": { + "x": 176, + "y": 134, + "w": 23, + "h": 12 + } + }, + { + "filename": "877_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 162, + "y": 150, + "w": 19, + "h": 23 + } + }, + { + "filename": "877_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 181, + "y": 146, + "w": 19, + "h": 23 + } + }, + { + "filename": "872_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 19, + "h": 16 + }, + "frame": { + "x": 162, + "y": 173, + "w": 19, + "h": 16 + } + }, + { + "filename": "877_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 181, + "y": 169, + "w": 19, + "h": 23 + } + }, + { + "filename": "872_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 19, + "h": 16 + }, + "frame": { + "x": 114, + "y": 181, + "w": 19, + "h": 16 + } } ] } @@ -1212,6 +1296,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:cd142ac26d3ff4d777ac48395f6c0967:80a80b33bb322d66e0dec19a53a88db9:ec5f05e7f30cd98f74db0c2326109fd3$" + "smartupdate": "$TexturePacker:SmartUpdate:8e75e5f92e697e744733262699ff9e55:55db782b3e64029bab811bdeb9677cdf:ec5f05e7f30cd98f74db0c2326109fd3$" } } diff --git a/public/images/pokemon_icons_8v.png b/public/images/pokemon_icons_8v.png index 2a46b3af743..bf3fe4528bf 100644 Binary files a/public/images/pokemon_icons_8v.png and b/public/images/pokemon_icons_8v.png differ diff --git a/public/images/pokemon_icons_9v.json b/public/images/pokemon_icons_9v.json index ee5bb941970..6817a30a77a 100644 --- a/public/images/pokemon_icons_9v.json +++ b/public/images/pokemon_icons_9v.json @@ -4,1082 +4,11 @@ "image": "pokemon_icons_9v.png", "format": "RGBA8888", "size": { - "w": 193, - "h": 193 + "w": 204, + "h": 204 }, "scale": 1, "frames": [ - { - "filename": "919_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 12, - "w": 18, - "h": 17 - }, - "frame": { - "x": 0, - "y": 0, - "w": 18, - "h": 17 - } - }, - { - "filename": "919_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 12, - "w": 18, - "h": 17 - }, - "frame": { - "x": 18, - "y": 0, - "w": 18, - "h": 17 - } - }, - { - "filename": "919_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 12, - "w": 18, - "h": 17 - }, - "frame": { - "x": 36, - "y": 0, - "w": 18, - "h": 17 - } - }, - { - "filename": "932_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 20, - "h": 21 - }, - "frame": { - "x": 54, - "y": 0, - "w": 20, - "h": 21 - } - }, - { - "filename": "932_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 20, - "h": 21 - }, - "frame": { - "x": 74, - "y": 0, - "w": 20, - "h": 21 - } - }, - { - "filename": "967_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 22, - "h": 21 - }, - "frame": { - "x": 94, - "y": 0, - "w": 22, - "h": 21 - } - }, - { - "filename": "967_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 22, - "h": 21 - }, - "frame": { - "x": 116, - "y": 0, - "w": 22, - "h": 21 - } - }, - { - "filename": "924_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 31, - "h": 22 - }, - "frame": { - "x": 138, - "y": 0, - "w": 31, - "h": 22 - } - }, - { - "filename": "1004_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 23, - "h": 22 - }, - "frame": { - "x": 169, - "y": 0, - "w": 23, - "h": 22 - } - }, - { - "filename": "924_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 31, - "h": 22 - }, - "frame": { - "x": 0, - "y": 17, - "w": 31, - "h": 22 - } - }, - { - "filename": "1004_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 23, - "h": 22 - }, - "frame": { - "x": 31, - "y": 17, - "w": 23, - "h": 22 - } - }, - { - "filename": "924_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 31, - "h": 22 - }, - "frame": { - "x": 54, - "y": 21, - "w": 31, - "h": 22 - } - }, - { - "filename": "925-three_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 31, - "h": 22 - }, - "frame": { - "x": 85, - "y": 21, - "w": 31, - "h": 22 - } - }, - { - "filename": "925-three_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 31, - "h": 22 - }, - "frame": { - "x": 116, - "y": 22, - "w": 31, - "h": 22 - } - }, - { - "filename": "925-three_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 31, - "h": 22 - }, - "frame": { - "x": 147, - "y": 22, - "w": 31, - "h": 22 - } - }, - { - "filename": "935_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 15, - "h": 23 - }, - "frame": { - "x": 178, - "y": 22, - "w": 15, - "h": 23 - } - }, - { - "filename": "933_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 27, - "h": 23 - }, - "frame": { - "x": 0, - "y": 39, - "w": 27, - "h": 23 - } - }, - { - "filename": "933_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 27, - "h": 23 - }, - "frame": { - "x": 27, - "y": 39, - "w": 27, - "h": 23 - } - }, - { - "filename": "948_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 18, - "h": 23 - }, - "frame": { - "x": 54, - "y": 43, - "w": 18, - "h": 23 - } - }, - { - "filename": "948_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 18, - "h": 23 - }, - "frame": { - "x": 72, - "y": 43, - "w": 18, - "h": 23 - } - }, - { - "filename": "920_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 24, - "h": 25 - }, - "frame": { - "x": 90, - "y": 43, - "w": 24, - "h": 25 - } - }, - { - "filename": "925-four_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 5, - "w": 31, - "h": 24 - }, - "frame": { - "x": 114, - "y": 44, - "w": 31, - "h": 24 - } - }, - { - "filename": "925-four_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 5, - "w": 31, - "h": 24 - }, - "frame": { - "x": 145, - "y": 44, - "w": 31, - "h": 24 - } - }, - { - "filename": "973_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 1, - "w": 17, - "h": 28 - }, - "frame": { - "x": 176, - "y": 45, - "w": 17, - "h": 28 - } - }, - { - "filename": "925-four_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 5, - "w": 31, - "h": 24 - }, - "frame": { - "x": 0, - "y": 62, - "w": 31, - "h": 24 - } - }, - { - "filename": "949_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 22, - "h": 27 - }, - "frame": { - "x": 31, - "y": 62, - "w": 22, - "h": 27 - } - }, - { - "filename": "920_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 24, - "h": 25 - }, - "frame": { - "x": 53, - "y": 66, - "w": 24, - "h": 25 - } - }, - { - "filename": "920_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 24, - "h": 25 - }, - "frame": { - "x": 77, - "y": 68, - "w": 24, - "h": 25 - } - }, - { - "filename": "987_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 26, - "h": 26 - }, - "frame": { - "x": 101, - "y": 68, - "w": 26, - "h": 26 - } - }, - { - "filename": "987_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 26, - "h": 26 - }, - "frame": { - "x": 127, - "y": 68, - "w": 26, - "h": 26 - } - }, - { - "filename": "949_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 22, - "h": 27 - }, - "frame": { - "x": 153, - "y": 68, - "w": 22, - "h": 27 - } - }, - { - "filename": "973_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 1, - "w": 17, - "h": 28 - }, - "frame": { - "x": 175, - "y": 73, - "w": 17, - "h": 28 - } - }, - { - "filename": "987_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 26, - "h": 26 - }, - "frame": { - "x": 0, - "y": 86, - "w": 26, - "h": 26 - } - }, - { - "filename": "962_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 21, - "h": 27 - }, - "frame": { - "x": 26, - "y": 89, - "w": 21, - "h": 27 - } - }, - { - "filename": "962_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 21, - "h": 27 - }, - "frame": { - "x": 47, - "y": 91, - "w": 21, - "h": 27 - } - }, - { - "filename": "962_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 21, - "h": 27 - }, - "frame": { - "x": 68, - "y": 93, - "w": 21, - "h": 27 - } - }, - { - "filename": "973_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 1, - "w": 17, - "h": 28 - }, - "frame": { - "x": 89, - "y": 94, - "w": 17, - "h": 28 - } - }, - { - "filename": "936_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 0, - "w": 22, - "h": 29 - }, - "frame": { - "x": 106, - "y": 94, - "w": 22, - "h": 29 - } - }, - { - "filename": "1000_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 24, - "h": 29 - }, - "frame": { - "x": 128, - "y": 94, - "w": 24, - "h": 29 - } - }, - { - "filename": "937_9", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 31, - "h": 29 - }, - "frame": { - "x": 152, - "y": 101, - "w": 31, - "h": 29 - } - }, - { - "filename": "1000_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 24, - "h": 29 - }, - "frame": { - "x": 0, - "y": 112, - "w": 24, - "h": 29 - } - }, - { - "filename": "1000_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 24, - "h": 29 - }, - "frame": { - "x": 24, - "y": 118, - "w": 24, - "h": 29 - } - }, - { - "filename": "934_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 29, - "h": 30 - }, - "frame": { - "x": 48, - "y": 120, - "w": 29, - "h": 30 - } - }, - { - "filename": "934_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 29, - "h": 30 - }, - "frame": { - "x": 77, - "y": 122, - "w": 29, - "h": 30 - } - }, - { - "filename": "988_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 28, - "h": 30 - }, - "frame": { - "x": 106, - "y": 123, - "w": 28, - "h": 30 - } - }, - { - "filename": "988_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 28, - "h": 30 - }, - "frame": { - "x": 134, - "y": 130, - "w": 28, - "h": 30 - } - }, - { - "filename": "994_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 29, - "h": 30 - }, - "frame": { - "x": 162, - "y": 130, - "w": 29, - "h": 30 - } - }, - { - "filename": "999_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 24, - "h": 30 - }, - "frame": { - "x": 0, - "y": 141, - "w": 24, - "h": 30 - } - }, - { - "filename": "999_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 24, - "h": 30 - }, - "frame": { - "x": 24, - "y": 147, - "w": 24, - "h": 30 - } - }, - { - "filename": "994_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 29, - "h": 30 - }, - "frame": { - "x": 48, - "y": 150, - "w": 29, - "h": 30 - } - }, - { - "filename": "999_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 24, - "h": 30 - }, - "frame": { - "x": 77, - "y": 152, - "w": 24, - "h": 30 - } - }, { "filename": "1001_2", "rotated": false, @@ -1095,8 +24,8 @@ "h": 30 }, "frame": { - "x": 101, - "y": 153, + "x": 0, + "y": 0, "w": 32, "h": 30 } @@ -1116,11 +45,1229 @@ "h": 30 }, "frame": { - "x": 133, - "y": 160, + "x": 0, + "y": 30, "w": 32, "h": 30 } + }, + { + "filename": "937_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 31, + "h": 29 + }, + "frame": { + "x": 32, + "y": 0, + "w": 31, + "h": 29 + } + }, + { + "filename": "937_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 31, + "h": 29 + }, + "frame": { + "x": 0, + "y": 60, + "w": 31, + "h": 29 + } + }, + { + "filename": "937_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 31, + "h": 29 + }, + "frame": { + "x": 32, + "y": 29, + "w": 31, + "h": 29 + } + }, + { + "filename": "937_9", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 31, + "h": 29 + }, + "frame": { + "x": 63, + "y": 0, + "w": 31, + "h": 29 + } + }, + { + "filename": "934_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 0, + "w": 29, + "h": 30 + }, + "frame": { + "x": 0, + "y": 89, + "w": 29, + "h": 30 + } + }, + { + "filename": "934_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 0, + "w": 29, + "h": 30 + }, + "frame": { + "x": 0, + "y": 119, + "w": 29, + "h": 30 + } + }, + { + "filename": "994_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 29, + "h": 30 + }, + "frame": { + "x": 0, + "y": 149, + "w": 29, + "h": 30 + } + }, + { + "filename": "920_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 24, + "h": 25 + }, + "frame": { + "x": 0, + "y": 179, + "w": 24, + "h": 25 + } + }, + { + "filename": "994_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 29, + "h": 30 + }, + "frame": { + "x": 63, + "y": 29, + "w": 29, + "h": 30 + } + }, + { + "filename": "988_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 28, + "h": 30 + }, + "frame": { + "x": 94, + "y": 0, + "w": 28, + "h": 30 + } + }, + { + "filename": "988_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 28, + "h": 30 + }, + "frame": { + "x": 122, + "y": 0, + "w": 28, + "h": 30 + } + }, + { + "filename": "925-four_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 5, + "w": 31, + "h": 24 + }, + "frame": { + "x": 150, + "y": 0, + "w": 31, + "h": 24 + } + }, + { + "filename": "1004_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 23, + "h": 22 + }, + "frame": { + "x": 181, + "y": 0, + "w": 23, + "h": 22 + } + }, + { + "filename": "920_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 24, + "h": 25 + }, + "frame": { + "x": 24, + "y": 179, + "w": 24, + "h": 25 + } + }, + { + "filename": "925-four_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 5, + "w": 31, + "h": 24 + }, + "frame": { + "x": 92, + "y": 30, + "w": 31, + "h": 24 + } + }, + { + "filename": "925-four_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 5, + "w": 31, + "h": 24 + }, + "frame": { + "x": 123, + "y": 30, + "w": 31, + "h": 24 + } + }, + { + "filename": "999_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 24, + "h": 30 + }, + "frame": { + "x": 154, + "y": 24, + "w": 24, + "h": 30 + } + }, + { + "filename": "987_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 26, + "h": 26 + }, + "frame": { + "x": 178, + "y": 24, + "w": 26, + "h": 26 + } + }, + { + "filename": "987_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 26, + "h": 26 + }, + "frame": { + "x": 178, + "y": 50, + "w": 26, + "h": 26 + } + }, + { + "filename": "924_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 7, + "w": 31, + "h": 22 + }, + "frame": { + "x": 92, + "y": 54, + "w": 31, + "h": 22 + } + }, + { + "filename": "924_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 7, + "w": 31, + "h": 22 + }, + "frame": { + "x": 123, + "y": 54, + "w": 31, + "h": 22 + } + }, + { + "filename": "920_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 24, + "h": 25 + }, + "frame": { + "x": 154, + "y": 54, + "w": 24, + "h": 25 + } + }, + { + "filename": "987_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 26, + "h": 26 + }, + "frame": { + "x": 178, + "y": 76, + "w": 26, + "h": 26 + } + }, + { + "filename": "924_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 7, + "w": 31, + "h": 22 + }, + "frame": { + "x": 32, + "y": 58, + "w": 31, + "h": 22 + } + }, + { + "filename": "933_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 27, + "h": 23 + }, + "frame": { + "x": 63, + "y": 59, + "w": 27, + "h": 23 + } + }, + { + "filename": "925-three_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 7, + "w": 31, + "h": 22 + }, + "frame": { + "x": 31, + "y": 80, + "w": 31, + "h": 22 + } + }, + { + "filename": "999_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 24, + "h": 30 + }, + "frame": { + "x": 29, + "y": 102, + "w": 24, + "h": 30 + } + }, + { + "filename": "999_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 24, + "h": 30 + }, + "frame": { + "x": 29, + "y": 132, + "w": 24, + "h": 30 + } + }, + { + "filename": "919_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 12, + "w": 18, + "h": 17 + }, + "frame": { + "x": 29, + "y": 162, + "w": 18, + "h": 17 + } + }, + { + "filename": "925-three_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 7, + "w": 31, + "h": 22 + }, + "frame": { + "x": 62, + "y": 82, + "w": 31, + "h": 22 + } + }, + { + "filename": "925-three_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 7, + "w": 31, + "h": 22 + }, + "frame": { + "x": 93, + "y": 76, + "w": 31, + "h": 22 + } + }, + { + "filename": "933_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 27, + "h": 23 + }, + "frame": { + "x": 124, + "y": 76, + "w": 27, + "h": 23 + } + }, + { + "filename": "1000_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 24, + "h": 29 + }, + "frame": { + "x": 53, + "y": 104, + "w": 24, + "h": 29 + } + }, + { + "filename": "1000_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 24, + "h": 29 + }, + "frame": { + "x": 53, + "y": 133, + "w": 24, + "h": 29 + } + }, + { + "filename": "936_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 0, + "w": 22, + "h": 29 + }, + "frame": { + "x": 77, + "y": 104, + "w": 22, + "h": 29 + } + }, + { + "filename": "936_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 0, + "w": 22, + "h": 29 + }, + "frame": { + "x": 77, + "y": 133, + "w": 22, + "h": 29 + } + }, + { + "filename": "1000_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 24, + "h": 29 + }, + "frame": { + "x": 99, + "y": 98, + "w": 24, + "h": 29 + } + }, + { + "filename": "936_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 0, + "w": 22, + "h": 29 + }, + "frame": { + "x": 99, + "y": 127, + "w": 22, + "h": 29 + } + }, + { + "filename": "949_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 2, + "w": 22, + "h": 27 + }, + "frame": { + "x": 123, + "y": 99, + "w": 22, + "h": 27 + } + }, + { + "filename": "1004_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 23, + "h": 22 + }, + "frame": { + "x": 151, + "y": 79, + "w": 23, + "h": 22 + } + }, + { + "filename": "949_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 2, + "w": 22, + "h": 27 + }, + "frame": { + "x": 145, + "y": 101, + "w": 22, + "h": 27 + } + }, + { + "filename": "919_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 12, + "w": 18, + "h": 17 + }, + "frame": { + "x": 47, + "y": 162, + "w": 18, + "h": 17 + } + }, + { + "filename": "948_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 18, + "h": 23 + }, + "frame": { + "x": 48, + "y": 179, + "w": 18, + "h": 23 + } + }, + { + "filename": "919_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 12, + "w": 18, + "h": 17 + }, + "frame": { + "x": 65, + "y": 162, + "w": 18, + "h": 17 + } + }, + { + "filename": "948_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 18, + "h": 23 + }, + "frame": { + "x": 66, + "y": 179, + "w": 18, + "h": 23 + } + }, + { + "filename": "962_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 2, + "w": 21, + "h": 27 + }, + "frame": { + "x": 167, + "y": 102, + "w": 21, + "h": 27 + } + }, + { + "filename": "935_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 6, + "w": 15, + "h": 23 + }, + "frame": { + "x": 188, + "y": 102, + "w": 15, + "h": 23 + } + }, + { + "filename": "973_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 1, + "w": 17, + "h": 28 + }, + "frame": { + "x": 121, + "y": 127, + "w": 17, + "h": 28 + } + }, + { + "filename": "962_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 2, + "w": 21, + "h": 27 + }, + "frame": { + "x": 138, + "y": 128, + "w": 21, + "h": 27 + } + }, + { + "filename": "962_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 2, + "w": 21, + "h": 27 + }, + "frame": { + "x": 159, + "y": 129, + "w": 21, + "h": 27 + } + }, + { + "filename": "973_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 1, + "w": 17, + "h": 28 + }, + "frame": { + "x": 180, + "y": 129, + "w": 17, + "h": 28 + } + }, + { + "filename": "967_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 22, + "h": 21 + }, + "frame": { + "x": 99, + "y": 156, + "w": 22, + "h": 21 + } + }, + { + "filename": "967_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 22, + "h": 21 + }, + "frame": { + "x": 121, + "y": 155, + "w": 22, + "h": 21 + } + }, + { + "filename": "935_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 6, + "w": 15, + "h": 23 + }, + "frame": { + "x": 84, + "y": 162, + "w": 15, + "h": 23 + } + }, + { + "filename": "935_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 6, + "w": 15, + "h": 23 + }, + "frame": { + "x": 143, + "y": 155, + "w": 15, + "h": 23 + } + }, + { + "filename": "932_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 20, + "h": 21 + }, + "frame": { + "x": 158, + "y": 156, + "w": 20, + "h": 21 + } + }, + { + "filename": "932_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 20, + "h": 21 + }, + "frame": { + "x": 178, + "y": 157, + "w": 20, + "h": 21 + } + }, + { + "filename": "973_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 1, + "w": 17, + "h": 28 + }, + "frame": { + "x": 121, + "y": 176, + "w": 17, + "h": 28 + } } ] } @@ -1128,6 +1275,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:050f7edcd10f98c70b4b9fc98e69c0d6:03ae662454323b748908e92fa92433dc:3ec5c0bc286c296cfb7fa30a8b06f3da$" + "smartupdate": "$TexturePacker:SmartUpdate:4b71cf0612d22372033807aba7026391:ccaa2f3365fdc125ee93279c465f951f:3ec5c0bc286c296cfb7fa30a8b06f3da$" } } diff --git a/public/images/pokemon_icons_9v.png b/public/images/pokemon_icons_9v.png index 256ec26d323..b3cf588dad4 100644 Binary files a/public/images/pokemon_icons_9v.png and b/public/images/pokemon_icons_9v.png differ diff --git a/src/battle-scene.ts b/src/battle-scene.ts index cbf363f689a..46f7b4ae0a2 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -235,6 +235,15 @@ export default class BattleScene extends SceneBase { this.nextCommandPhaseQueue = []; } + /** + * Conditionally swaps the ACTION and CANCEL button + * @param standard When true, uses the default values + */ + setGamepadConfirm(standard: boolean) { + this.gamepadKeyConfig[Button.ACTION] = standard ? 0 : 1; + this.gamepadKeyConfig[Button.CANCEL] = standard ? 1 : 0; + } + loadPokemonAtlas(key: string, atlasPath: string, experimental?: boolean) { if (experimental === undefined) experimental = this.experimentalSprites; @@ -1671,11 +1680,13 @@ export default class BattleScene extends SceneBase { return 13.122; case 'battle_unova_gym': return 19.145; - case 'battle_legendary': + case 'battle_legendary_regis': //B2W2 Legendary Titan Battle + return 49.500; + case 'battle_legendary_unova': //BW Unova Legendary Battle return 13.855; - case 'battle_legendary_k': + case 'battle_legendary_kyurem': //BW Kyurem Battle return 18.314; - case 'battle_legendary_rz': + case 'battle_legendary_res_zek': //BW Reshiram & Zekrom Battle return 18.329; case 'battle_rival': return 13.689; diff --git a/src/battle.ts b/src/battle.ts index 97dec471649..0f910159ff5 100644 --- a/src/battle.ts +++ b/src/battle.ts @@ -195,11 +195,17 @@ export default class Battle { return 'battle_final_encounter'; } if (pokemon.species.legendary || pokemon.species.pseudoLegendary || pokemon.species.mythical) { + if (pokemon.species.speciesId === Species.REGIROCK || pokemon.species.speciesId === Species.REGICE || pokemon.species.speciesId === Species.REGISTEEL || pokemon.species.speciesId === Species.REGIGIGAS || pokemon.species.speciesId === Species.REGIELEKI || pokemon.species.speciesId === Species.REGIDRAGO) + return 'battle_legendary_regis'; + if (pokemon.species.speciesId === Species.COBALION || pokemon.species.speciesId === Species.TERRAKION || pokemon.species.speciesId === Species.VIRIZION || pokemon.species.speciesId === Species.TORNADUS || pokemon.species.speciesId === Species.THUNDURUS || pokemon.species.speciesId === Species.LANDORUS || pokemon.species.speciesId === Species.KELDEO || pokemon.species.speciesId === Species.MELOETTA || pokemon.species.speciesId === Species.GENESECT) + return 'battle_legendary_unova'; + if (pokemon.species.speciesId === Species.RESHIRAM || pokemon.species.speciesId === Species.ZEKROM) + return 'battle_legendary_res_zek'; if (pokemon.species.speciesId === Species.KYUREM) - return 'battle_legendary_k'; + return 'battle_legendary_kyurem'; if (pokemon.species.legendary) - return 'battle_legendary_rz'; - return 'battle_legendary'; + return 'battle_legendary_res_zek'; + return 'battle_legendary_unova'; } } diff --git a/src/data/ability.ts b/src/data/ability.ts index 39c70fd7ee3..57d1402ad8d 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -3224,8 +3224,7 @@ export function initAbilities() { .attr(UncopiableAbilityAbAttr) .attr(UnswappableAbilityAbAttr) .attr(UnsuppressableAbilityAbAttr) - .attr(NoFusionAbilityAbAttr) - .partial(), + .attr(NoFusionAbilityAbAttr), new Ability(Abilities.POWER_CONSTRUCT, 7) // TODO: 10% Power Construct Zygarde isn't accounted for yet. If changed, update Zygarde's getSpeciesFormIndex entry accordingly .attr(PostBattleInitFormChangeAbAttr, p => p.getHpRatio() <= 0.5 ? 4 : 2) .attr(PostSummonFormChangeAbAttr, p => p.getHpRatio() <= 0.5 ? 4 : 2) diff --git a/src/data/move.ts b/src/data/move.ts index b8a516e4028..f5fc8e3ebcb 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -756,7 +756,7 @@ export enum MultiHitType { _2_TO_5, _3, _3_INCR, - _1_TO_10 + _1_TO_10, } export class HealAttr extends MoveEffectAttr { @@ -912,7 +912,9 @@ export class MultiHitAttr extends MoveAttr { apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { let hitTimes: integer; - switch (this.multiHitType) { + const hitType = new Utils.IntegerHolder(this.multiHitType) + applyMoveAttrs(ChangeMultiHitTypeAttr, user, target, move, hitType) + switch (hitType.value) { case MultiHitType._2_TO_5: { const rand = user.randSeedInt(16); @@ -975,6 +977,23 @@ export class MultiHitAttr extends MoveAttr { } } +export class ChangeMultiHitTypeAttr extends MoveAttr { + apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { + //const hitType = args[0] as Utils.NumberHolder; + return false; + } +} + +export class WaterShurikenMultiHitTypeAttr extends ChangeMultiHitTypeAttr { + apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { + if (user.species.speciesId == Species.GRENINJA && user.hasAbility(Abilities.BATTLE_BOND) && user.formIndex == 2) { + (args[0] as Utils.IntegerHolder).value = MultiHitType._3 + return true; + } + return false; + } +} + export class StatusEffectAttr extends MoveEffectAttr { public effect: StatusEffect; public cureTurn: integer; @@ -2049,6 +2068,16 @@ export class KnockOffPowerAttr extends VariablePowerAttr { } } +export class WaterShurikenPowerAttr extends VariablePowerAttr { + apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { + if (user.species.speciesId == Species.GRENINJA && user.hasAbility(Abilities.BATTLE_BOND) && user.formIndex == 2) { + (args[0] as Utils.IntegerHolder).value = 20 + return true; + } + return false; + } +} + export class VariableAtkAttr extends MoveAttr { constructor() { super(); @@ -2847,7 +2876,7 @@ export class AddArenaTagAttr extends MoveEffectAttr { public tagType: ArenaTagType; public turnCount: integer; private failOnOverlap: boolean; - private selfSideTarget: boolean; + public selfSideTarget: boolean; constructor(tagType: ArenaTagType, turnCount?: integer, failOnOverlap: boolean = false, selfSideTarget: boolean = false) { super(true, MoveEffectTrigger.POST_APPLY, true); @@ -2880,9 +2909,10 @@ export class AddArenaTagAttr extends MoveEffectAttr { export class AddArenaTrapTagAttr extends AddArenaTagAttr { getCondition(): MoveConditionFunc { return (user, target, move) => { - if (move.category !== MoveCategory.STATUS || !user.scene.arena.getTag(this.tagType)) + const side = (this.selfSideTarget ? user : target).isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY; + if (move.category !== MoveCategory.STATUS || !user.scene.arena.getTagOnSide(this.tagType, side)) return true; - const tag = user.scene.arena.getTag(this.tagType) as ArenaTrapTag; + const tag = user.scene.arena.getTagOnSide(this.tagType, side) as ArenaTrapTag; return tag.layers < tag.maxLayers; }; } @@ -5502,7 +5532,9 @@ export function initMoves() { new AttackMove(Moves.HYPERSPACE_HOLE, Type.PSYCHIC, MoveCategory.SPECIAL, 80, -1, 5, -1, 0, 6) .ignoresProtect(), new AttackMove(Moves.WATER_SHURIKEN, Type.WATER, MoveCategory.SPECIAL, 15, 100, 20, -1, 1, 6) - .attr(MultiHitAttr), + .attr(MultiHitAttr) + .attr(WaterShurikenPowerAttr) + .attr(WaterShurikenMultiHitTypeAttr), new AttackMove(Moves.MYSTICAL_FIRE, Type.FIRE, MoveCategory.SPECIAL, 75, 100, 10, 100, 0, 6) .attr(StatChangeAttr, BattleStat.SPATK, -1), new SelfStatusMove(Moves.SPIKY_SHIELD, Type.GRASS, -1, 10, -1, 4, 6) diff --git a/src/data/terrain.ts b/src/data/terrain.ts index 48ffc1c680c..c0328d98d6c 100644 --- a/src/data/terrain.ts +++ b/src/data/terrain.ts @@ -4,6 +4,7 @@ import { Type } from "./type"; import * as Utils from "../utils"; import { IncrementMovePriorityAbAttr, applyAbAttrs } from "./ability"; import { ProtectAttr } from "./move"; +import { BattlerIndex } from "#app/battle.js"; export enum TerrainType { NONE, @@ -48,13 +49,13 @@ export class Terrain { return 1; } - isMoveTerrainCancelled(user: Pokemon, move: Move): boolean { + isMoveTerrainCancelled(user: Pokemon, targets: BattlerIndex[], move: Move): boolean { switch (this.terrainType) { case TerrainType.PSYCHIC: - if (!move.getAttrs(ProtectAttr).length){ + if (!move.getAttrs(ProtectAttr).length) { const priority = new Utils.IntegerHolder(move.priority); applyAbAttrs(IncrementMovePriorityAbAttr, user, null, move, priority); - return priority.value > 0; + return priority.value > 0 && user.getOpponents().filter(o => targets.includes(o.getBattlerIndex())).length > 0; } } diff --git a/src/field/arena.ts b/src/field/arena.ts index 5b14560d407..c27e42b89a2 100644 --- a/src/field/arena.ts +++ b/src/field/arena.ts @@ -336,8 +336,8 @@ export class Arena { return this.weather && !this.weather.isEffectSuppressed(this.scene) && this.weather.isMoveWeatherCancelled(move); } - isMoveTerrainCancelled(user: Pokemon, move: Move) { - return this.terrain && this.terrain.isMoveTerrainCancelled(user, move); + isMoveTerrainCancelled(user: Pokemon, targets: BattlerIndex[], move: Move) { + return this.terrain && this.terrain.isMoveTerrainCancelled(user, targets, move); } getTerrainType() : TerrainType { @@ -492,7 +492,7 @@ export class Arena { } addTag(tagType: ArenaTagType, turnCount: integer, sourceMove: Moves, sourceId: integer, side: ArenaTagSide = ArenaTagSide.BOTH, targetIndex?: BattlerIndex): boolean { - const existingTag = this.getTag(tagType); + const existingTag = this.getTagOnSide(tagType, side); if (existingTag) { existingTag.onOverlap(this); return false; diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 7281090b3e0..606185e0984 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -1904,6 +1904,21 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { applyAbAttrs(ReduceStatusEffectDurationAbAttr, this, null, effect, statusCureTurn); this.setFrameRate(4); + + // If the user is invulnerable, lets remove their invulnerability when they fall asleep + const invulnerableTags = [ + BattlerTagType.UNDERGROUND, + BattlerTagType.UNDERWATER, + BattlerTagType.HIDDEN, + BattlerTagType.FLYING + ]; + + const tag = invulnerableTags.find((t) => this.getTag(t)); + + if (tag) { + this.removeTag(tag); + this.getMoveQueue().pop(); + } } this.status = new Status(effect, 0, statusCureTurn?.value); diff --git a/src/phases.ts b/src/phases.ts index e65e76daa8a..6f1ebc261da 100644 --- a/src/phases.ts +++ b/src/phases.ts @@ -1189,7 +1189,8 @@ export class SummonPhase extends PartyMemberPokemonPhase { console.warn("The Pokemon about to be sent out is fainted. Attempting to resolve..."); const party = this.getParty(); - const nonFaintedIndex = party.findIndex(x => !x.isFainted()); // Find the first non-fainted Pokemon index + // Find the first non-fainted Pokemon index above the current one + const nonFaintedIndex = party.findIndex((p, i) => i > this.partyMemberIndex && !p.isFainted()); if (nonFaintedIndex === -1) { console.error("Party Details:\n", party); throw new Error("All available Pokemon were fainted!"); @@ -2280,7 +2281,7 @@ export class MovePhase extends BattlePhase { let failedText = null; if (success && this.scene.arena.isMoveWeatherCancelled(this.move.getMove())) success = false; - else if (success && this.scene.arena.isMoveTerrainCancelled(this.pokemon, this.move.getMove())) { + else if (success && this.scene.arena.isMoveTerrainCancelled(this.pokemon, this.targets, this.move.getMove())) { success = false; failedText = getTerrainBlockMessage(targets[0], this.scene.arena.terrain.terrainType); } diff --git a/src/system/settings.ts b/src/system/settings.ts index 8f0b169efc1..e5769dfcce9 100644 --- a/src/system/settings.ts +++ b/src/system/settings.ts @@ -25,6 +25,7 @@ export enum Setting { Fusion_Palette_Swaps = "FUSION_PALETTE_SWAPS", Player_Gender = "PLAYER_GENDER", Gamepad_Support = "GAMEPAD_SUPPORT", + Swap_A_and_B = "SWAP_A_B", // Swaps which gamepad button handles ACTION and CANCEL Touch_Controls = "TOUCH_CONTROLS", Vibration = "VIBRATION" } @@ -56,6 +57,7 @@ export const settingOptions: SettingOptions = { [Setting.Fusion_Palette_Swaps]: [ 'Off', 'On' ], [Setting.Player_Gender]: [ 'Boy', 'Girl' ], [Setting.Gamepad_Support]: [ 'Auto', 'Disabled' ], + [Setting.Swap_A_and_B]: [ 'Enabled', 'Disabled' ], [Setting.Touch_Controls]: [ 'Auto', 'Disabled' ], [Setting.Vibration]: [ 'Auto', 'Disabled' ] }; @@ -79,6 +81,7 @@ export const settingDefaults: SettingDefaults = { [Setting.Fusion_Palette_Swaps]: 1, [Setting.Player_Gender]: 0, [Setting.Gamepad_Support]: 0, + [Setting.Swap_A_and_B]: 1, // Set to 'Disabled' by default [Setting.Touch_Controls]: 0, [Setting.Vibration]: 0 }; @@ -148,6 +151,9 @@ export function setSetting(scene: BattleScene, setting: Setting, value: integer) case Setting.Gamepad_Support: scene.gamepadSupport = settingOptions[setting][value] !== 'Disabled'; break; + case Setting.Swap_A_and_B: + scene.setGamepadConfirm(settingOptions[setting][value] !== 'Enabled'); + break; case Setting.Touch_Controls: scene.enableTouchControls = settingOptions[setting][value] !== 'Disabled' && hasTouchscreen(); const touchControls = document.getElementById('touchControls');