diff --git a/public/images/pokemon/172-spiky.json b/public/images/pokemon/172-spiky.json new file mode 100644 index 000000000..e867ae071 --- /dev/null +++ b/public/images/pokemon/172-spiky.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "172-spiky.png", + "format": "RGBA8888", + "size": { + "w": 37, + "h": 37 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 37, + "h": 37 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 37 + }, + "frame": { + "x": 0, + "y": 0, + "w": 32, + "h": 37 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:a54544be532be719321d616d8c7aced5:a2bb30b1b8b6f639fce8842f57cfa1b1:9ae51c05debb17f5b4855b9604caf349$" + } +} diff --git a/public/images/pokemon/172-spiky.png b/public/images/pokemon/172-spiky.png new file mode 100644 index 000000000..5e79da2b3 Binary files /dev/null and b/public/images/pokemon/172-spiky.png differ diff --git a/public/images/pokemon/back/172-spiky.json b/public/images/pokemon/back/172-spiky.json new file mode 100644 index 000000000..ddc0fe9b9 --- /dev/null +++ b/public/images/pokemon/back/172-spiky.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "172-spiky.png", + "format": "RGBA8888", + "size": { + "w": 37, + "h": 37 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 37, + "h": 37 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 28, + "h": 37 + }, + "frame": { + "x": 0, + "y": 0, + "w": 28, + "h": 37 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:0d1cec69240ba50d6a304f627a54acaf:827b2992c2d340b0dc5f851caeb6463e:9ae51c05debb17f5b4855b9604caf349$" + } +} diff --git a/public/images/pokemon/back/172-spiky.png b/public/images/pokemon/back/172-spiky.png new file mode 100644 index 000000000..fdff8ac77 Binary files /dev/null and b/public/images/pokemon/back/172-spiky.png differ diff --git a/public/images/pokemon/back/shiny/172-spiky.json b/public/images/pokemon/back/shiny/172-spiky.json new file mode 100644 index 000000000..06ab4320b --- /dev/null +++ b/public/images/pokemon/back/shiny/172-spiky.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "172-spiky.png", + "format": "RGBA8888", + "size": { + "w": 37, + "h": 37 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 37, + "h": 37 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 28, + "h": 37 + }, + "frame": { + "x": 0, + "y": 0, + "w": 28, + "h": 37 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:d29f82d65f41d6a2345d138505688bcf:878f83394f1d74e94db8f5e999befc35:9ae51c05debb17f5b4855b9604caf349$" + } +} diff --git a/public/images/pokemon/back/shiny/172-spiky.png b/public/images/pokemon/back/shiny/172-spiky.png new file mode 100644 index 000000000..89815c11d Binary files /dev/null and b/public/images/pokemon/back/shiny/172-spiky.png differ diff --git a/public/images/pokemon/icons/172-spiky.png b/public/images/pokemon/icons/172-spiky.png new file mode 100644 index 000000000..40e0ea45e Binary files /dev/null and b/public/images/pokemon/icons/172-spiky.png differ diff --git a/public/images/pokemon/icons/172s-spiky.png b/public/images/pokemon/icons/172s-spiky.png new file mode 100644 index 000000000..6d29bb7ac Binary files /dev/null and b/public/images/pokemon/icons/172s-spiky.png differ diff --git a/public/images/pokemon/shiny/172-spiky.json b/public/images/pokemon/shiny/172-spiky.json new file mode 100644 index 000000000..db03d7967 --- /dev/null +++ b/public/images/pokemon/shiny/172-spiky.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "172-spiky.png", + "format": "RGBA8888", + "size": { + "w": 37, + "h": 37 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 37, + "h": 37 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 37 + }, + "frame": { + "x": 0, + "y": 0, + "w": 32, + "h": 37 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:49a07db3effcc103cbb05f5e4fcb1155:fe0e8884b0d24f136e2bc354b3a1bb1b:9ae51c05debb17f5b4855b9604caf349$" + } +} diff --git a/public/images/pokemon/shiny/172-spiky.png b/public/images/pokemon/shiny/172-spiky.png new file mode 100644 index 000000000..78d09474b Binary files /dev/null and b/public/images/pokemon/shiny/172-spiky.png differ diff --git a/public/images/pokemon_icons_2.json b/public/images/pokemon_icons_2.json index f592c92e5..67d78812e 100644 --- a/public/images/pokemon_icons_2.json +++ b/public/images/pokemon_icons_2.json @@ -4,7 +4,7 @@ "image": "pokemon_icons_2.png", "format": "RGBA8888", "size": { - "w": 253, + "w": 255, "h": 462 }, "scale": 1, @@ -1962,6 +1962,27 @@ "h": 23 } }, + { + "filename": "229", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 20, + "h": 23 + }, + "frame": { + "x": 235, + "y": 25, + "w": 20, + "h": 23 + } + }, { "filename": "164s", "rotated": false, @@ -1976,31 +1997,10 @@ "w": 18, "h": 23 }, - "frame": { - "x": 235, - "y": 25, - "w": 18, - "h": 23 - } - }, - { - "filename": "210s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 22, - "h": 23 - }, "frame": { "x": 152, "y": 51, - "w": 22, + "w": 18, "h": 23 } }, @@ -2026,7 +2026,7 @@ } }, { - "filename": "217", + "filename": "210s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2036,13 +2036,13 @@ "spriteSourceSize": { "x": 9, "y": 5, - "w": 21, + "w": 22, "h": 23 }, "frame": { - "x": 174, + "x": 170, "y": 49, - "w": 21, + "w": 22, "h": 23 } }, @@ -2061,7 +2061,7 @@ "h": 21 }, "frame": { - "x": 195, + "x": 192, "y": 48, "w": 24, "h": 21 @@ -2082,14 +2082,14 @@ "h": 21 }, "frame": { - "x": 219, + "x": 216, "y": 48, "w": 24, "h": 21 } }, { - "filename": "201-a", + "filename": "201s-c", "rotated": false, "trimmed": true, "sourceSize": { @@ -2097,15 +2097,99 @@ "h": 30 }, "spriteSourceSize": { - "x": 15, + "x": 13, + "y": 8, + "w": 15, + "h": 20 + }, + "frame": { + "x": 240, + "y": 48, + "w": 15, + "h": 20 + } + }, + { + "filename": "217", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 21, + "h": 23 + }, + "frame": { + "x": 172, + "y": 72, + "w": 21, + "h": 23 + } + }, + { + "filename": "162s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, "y": 7, - "w": 10, + "w": 23, "h": 21 }, "frame": { - "x": 243, - "y": 48, - "w": 10, + "x": 193, + "y": 69, + "w": 23, + "h": 21 + } + }, + { + "filename": "185", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 22, + "h": 21 + }, + "frame": { + "x": 216, + "y": 69, + "w": 22, + "h": 21 + } + }, + { + "filename": "176", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 17, + "h": 21 + }, + "frame": { + "x": 238, + "y": 69, + "w": 17, "h": 21 } }, @@ -2130,6 +2214,111 @@ "h": 23 } }, + { + "filename": "217s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 21, + "h": 23 + }, + "frame": { + "x": 173, + "y": 95, + "w": 21, + "h": 23 + } + }, + { + "filename": "189s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 6, + "w": 22, + "h": 22 + }, + "frame": { + "x": 194, + "y": 90, + "w": 22, + "h": 22 + } + }, + { + "filename": "242", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 22, + "h": 22 + }, + "frame": { + "x": 216, + "y": 90, + "w": 22, + "h": 22 + } + }, + { + "filename": "176s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 17, + "h": 21 + }, + "frame": { + "x": 238, + "y": 90, + "w": 17, + "h": 21 + } + }, + { + "filename": "178", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 17, + "h": 21 + }, + "frame": { + "x": 238, + "y": 111, + "w": 17, + "h": 21 + } + }, { "filename": "211", "rotated": false, @@ -2145,14 +2334,14 @@ "h": 19 }, "frame": { - "x": 195, - "y": 69, + "x": 194, + "y": 112, "w": 24, "h": 19 } }, { - "filename": "211s", + "filename": "197", "rotated": false, "trimmed": true, "sourceSize": { @@ -2160,36 +2349,36 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 9, - "w": 24, - "h": 19 - }, - "frame": { - "x": 219, - "y": 69, - "w": 24, - "h": 19 - } - }, - { - "filename": "201-g", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 15, + "x": 10, "y": 7, - "w": 10, + "w": 20, "h": 21 }, "frame": { - "x": 243, - "y": 69, - "w": 10, + "x": 218, + "y": 112, + "w": 20, + "h": 21 + } + }, + { + "filename": "178s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 17, + "h": 21 + }, + "frame": { + "x": 238, + "y": 132, + "w": 17, "h": 21 } }, @@ -2208,14 +2397,14 @@ "h": 20 }, "frame": { - "x": 174, - "y": 72, + "x": 173, + "y": 118, "w": 21, "h": 20 } }, { - "filename": "189s", + "filename": "246", "rotated": false, "trimmed": true, "sourceSize": { @@ -2223,175 +2412,7 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 22, - "h": 22 - }, - "frame": { - "x": 173, - "y": 92, - "w": 22, - "h": 22 - } - }, - { - "filename": "162s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 23, - "h": 21 - }, - "frame": { - "x": 195, - "y": 88, - "w": 23, - "h": 21 - } - }, - { - "filename": "185", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 22, - "h": 21 - }, - "frame": { - "x": 218, - "y": 88, - "w": 22, - "h": 21 - } - }, - { - "filename": "236", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 14, - "y": 7, - "w": 13, - "h": 21 - }, - "frame": { - "x": 240, - "y": 90, - "w": 13, - "h": 21 - } - }, - { - "filename": "183s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 11, - "w": 23, - "h": 17 - }, - "frame": { - "x": 195, - "y": 109, - "w": 23, - "h": 17 - } - }, - { - "filename": "179", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 22, - "h": 20 - }, - "frame": { - "x": 218, - "y": 109, - "w": 22, - "h": 20 - } - }, - { - "filename": "236s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 14, - "y": 7, - "w": 13, - "h": 21 - }, - "frame": { - "x": 240, - "y": 111, - "w": 13, - "h": 21 - } - }, - { - "filename": "179s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 22, - "h": 20 - }, - "frame": { - "x": 173, - "y": 114, - "w": 22, - "h": 20 - } - }, - { - "filename": "201s-c", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, + "x": 12, "y": 8, "w": 15, "h": 20 @@ -2404,7 +2425,7 @@ } }, { - "filename": "205", + "filename": "211s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2412,20 +2433,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 10, - "w": 23, - "h": 18 + "x": 8, + "y": 9, + "w": 24, + "h": 19 }, "frame": { - "x": 195, - "y": 126, - "w": 23, - "h": 18 + "x": 194, + "y": 131, + "w": 24, + "h": 19 } }, { - "filename": "185s", + "filename": "197s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2433,314 +2454,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 22, + "x": 10, + "y": 7, + "w": 20, "h": 21 }, "frame": { "x": 218, - "y": 129, - "w": 22, + "y": 133, + "w": 20, "h": 21 } }, { - "filename": "201-k", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 13, - "h": 20 - }, - "frame": { - "x": 240, - "y": 132, - "w": 13, - "h": 20 - } - }, - { - "filename": "187", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 22, - "h": 20 - }, - "frame": { - "x": 173, - "y": 134, - "w": 22, - "h": 20 - } - }, - { - "filename": "201-l", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 13, - "h": 20 - }, - "frame": { - "x": 160, - "y": 141, - "w": 13, - "h": 20 - } - }, - { - "filename": "205s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 10, - "w": 23, - "h": 18 - }, - "frame": { - "x": 195, - "y": 144, - "w": 23, - "h": 18 - } - }, - { - "filename": "187s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 22, - "h": 20 - }, - "frame": { - "x": 173, - "y": 154, - "w": 22, - "h": 20 - } - }, - { - "filename": "201-b", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 14, - "y": 7, - "w": 12, - "h": 21 - }, - "frame": { - "x": 161, - "y": 161, - "w": 12, - "h": 21 - } - }, - { - "filename": "201-n", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 13, - "w": 22, - "h": 14 - }, - "frame": { - "x": 218, - "y": 150, - "w": 22, - "h": 14 - } - }, - { - "filename": "201s-k", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 13, - "h": 20 - }, - "frame": { - "x": 240, - "y": 152, - "w": 13, - "h": 20 - } - }, - { - "filename": "201s-n", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 13, - "w": 22, - "h": 14 - }, - "frame": { - "x": 195, - "y": 162, - "w": 22, - "h": 14 - } - }, - { - "filename": "221", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 22, - "h": 21 - }, - "frame": { - "x": 217, - "y": 164, - "w": 22, - "h": 21 - } - }, - { - "filename": "201s-s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 5, - "w": 14, - "h": 23 - }, - "frame": { - "x": 239, - "y": 172, - "w": 14, - "h": 23 - } - }, - { - "filename": "221s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 22, - "h": 21 - }, - "frame": { - "x": 173, - "y": 174, - "w": 22, - "h": 21 - } - }, - { - "filename": "242", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 22, - "h": 22 - }, - "frame": { - "x": 195, - "y": 176, - "w": 22, - "h": 22 - } - }, - { - "filename": "242s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 22, - "h": 22 - }, - "frame": { - "x": 217, - "y": 185, - "w": 22, - "h": 22 - } - }, - { - "filename": "201-e", + "filename": "215", "rotated": false, "trimmed": true, "sourceSize": { @@ -2749,35 +2476,14 @@ }, "spriteSourceSize": { "x": 12, - "y": 8, - "w": 14, - "h": 20 - }, - "frame": { - "x": 239, - "y": 195, - "w": 14, - "h": 20 - } - }, - { - "filename": "201-question", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 14, "y": 7, - "w": 11, + "w": 17, "h": 21 }, "frame": { - "x": 162, - "y": 182, - "w": 11, + "x": 238, + "y": 153, + "w": 17, "h": 21 } }, @@ -2797,7 +2503,70 @@ }, "frame": { "x": 173, - "y": 195, + "y": 138, + "w": 21, + "h": 20 + } + }, + { + "filename": "236", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 7, + "w": 13, + "h": 21 + }, + "frame": { + "x": 160, + "y": 141, + "w": 13, + "h": 21 + } + }, + { + "filename": "183s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 11, + "w": 23, + "h": 17 + }, + "frame": { + "x": 194, + "y": 150, + "w": 23, + "h": 17 + } + }, + { + "filename": "209", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 21, + "h": 20 + }, + "frame": { + "x": 217, + "y": 154, "w": 21, "h": 20 } @@ -2817,14 +2586,14 @@ "h": 19 }, "frame": { - "x": 194, - "y": 198, + "x": 173, + "y": 158, "w": 21, "h": 19 } }, { - "filename": "201-j", + "filename": "201-b", "rotated": false, "trimmed": true, "sourceSize": { @@ -2832,16 +2601,37 @@ "h": 30 }, "spriteSourceSize": { - "x": 15, - "y": 9, - "w": 11, - "h": 19 + "x": 14, + "y": 7, + "w": 12, + "h": 21 }, "frame": { - "x": 162, - "y": 203, - "w": 11, - "h": 19 + "x": 161, + "y": 162, + "w": 12, + "h": 21 + } + }, + { + "filename": "205", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 10, + "w": 23, + "h": 18 + }, + "frame": { + "x": 194, + "y": 167, + "w": 23, + "h": 18 } }, { @@ -2860,13 +2650,34 @@ }, "frame": { "x": 173, - "y": 215, + "y": 177, "w": 21, "h": 19 } }, { - "filename": "209", + "filename": "201-question", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 7, + "w": 11, + "h": 21 + }, + "frame": { + "x": 162, + "y": 183, + "w": 11, + "h": 21 + } + }, + { + "filename": "205s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2875,59 +2686,59 @@ }, "spriteSourceSize": { "x": 9, + "y": 10, + "w": 23, + "h": 18 + }, + "frame": { + "x": 217, + "y": 174, + "w": 23, + "h": 18 + } + }, + { + "filename": "246s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, "y": 8, - "w": 21, + "w": 15, + "h": 20 + }, + "frame": { + "x": 240, + "y": 174, + "w": 15, + "h": 20 + } + }, + { + "filename": "179", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 8, + "w": 22, "h": 20 }, "frame": { "x": 194, - "y": 217, - "w": 21, + "y": 185, + "w": 22, "h": 20 } }, - { - "filename": "217s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 21, - "h": 23 - }, - "frame": { - "x": 215, - "y": 207, - "w": 21, - "h": 23 - } - }, - { - "filename": "176", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 7, - "w": 17, - "h": 21 - }, - "frame": { - "x": 236, - "y": 215, - "w": 17, - "h": 21 - } - }, { "filename": "209s", "rotated": false, @@ -2943,14 +2754,14 @@ "h": 20 }, "frame": { - "x": 215, - "y": 230, + "x": 173, + "y": 196, "w": 21, "h": 20 } }, { - "filename": "176s", + "filename": "179s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2958,13 +2769,202 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, + "x": 8, + "y": 8, + "w": 22, + "h": 20 + }, + "frame": { + "x": 216, + "y": 192, + "w": 22, + "h": 20 + } + }, + { + "filename": "215s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, "y": 7, "w": 17, "h": 21 }, "frame": { - "x": 236, + "x": 238, + "y": 194, + "w": 17, + "h": 21 + } + }, + { + "filename": "185s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 22, + "h": 21 + }, + "frame": { + "x": 194, + "y": 205, + "w": 22, + "h": 21 + } + }, + { + "filename": "187", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 22, + "h": 20 + }, + "frame": { + "x": 216, + "y": 212, + "w": 22, + "h": 20 + } + }, + { + "filename": "218", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 7, + "w": 17, + "h": 21 + }, + "frame": { + "x": 238, + "y": 215, + "w": 17, + "h": 21 + } + }, + { + "filename": "201-j", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 15, + "y": 9, + "w": 11, + "h": 19 + }, + "frame": { + "x": 162, + "y": 204, + "w": 11, + "h": 19 + } + }, + { + "filename": "219", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 6, + "w": 21, + "h": 22 + }, + "frame": { + "x": 173, + "y": 216, + "w": 21, + "h": 22 + } + }, + { + "filename": "187s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 22, + "h": 20 + }, + "frame": { + "x": 194, + "y": 226, + "w": 22, + "h": 20 + } + }, + { + "filename": "201-n", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 13, + "w": 22, + "h": 14 + }, + "frame": { + "x": 216, + "y": 232, + "w": 22, + "h": 14 + } + }, + { + "filename": "218s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 7, + "w": 17, + "h": 21 + }, + "frame": { + "x": 238, "y": 236, "w": 17, "h": 21 @@ -2986,32 +2986,11 @@ }, "frame": { "x": 159, - "y": 222, + "y": 223, "w": 14, "h": 19 } }, - { - "filename": "219", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 21, - "h": 22 - }, - "frame": { - "x": 173, - "y": 234, - "w": 21, - "h": 22 - } - }, { "filename": "219s", "rotated": false, @@ -3027,14 +3006,14 @@ "h": 22 }, "frame": { - "x": 194, - "y": 237, + "x": 173, + "y": 238, "w": 21, "h": 22 } }, { - "filename": "222", + "filename": "201s-n", "rotated": false, "trimmed": true, "sourceSize": { @@ -3043,19 +3022,40 @@ }, "spriteSourceSize": { "x": 9, - "y": 8, - "w": 21, - "h": 20 + "y": 13, + "w": 22, + "h": 14 }, "frame": { - "x": 215, - "y": 250, - "w": 21, - "h": 20 + "x": 194, + "y": 246, + "w": 22, + "h": 14 } }, { - "filename": "178", + "filename": "221", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 22, + "h": 21 + }, + "frame": { + "x": 216, + "y": 246, + "w": 22, + "h": 21 + } + }, + { + "filename": "163", "rotated": false, "trimmed": true, "sourceSize": { @@ -3064,19 +3064,19 @@ }, "spriteSourceSize": { "x": 11, - "y": 7, + "y": 8, "w": 17, - "h": 21 + "h": 20 }, "frame": { - "x": 236, + "x": 238, "y": 257, "w": 17, - "h": 21 + "h": 20 } }, { - "filename": "225", + "filename": "201s-s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3084,20 +3084,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, + "x": 13, "y": 5, - "w": 19, + "w": 14, "h": 23 }, "frame": { "x": 74, "y": 220, - "w": 19, + "w": 14, "h": 23 } }, { - "filename": "202", + "filename": "242s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3105,20 +3105,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 7, - "w": 18, - "h": 21 + "x": 10, + "y": 6, + "w": 22, + "h": 22 }, "frame": { - "x": 93, + "x": 88, "y": 218, - "w": 18, - "h": 21 + "w": 22, + "h": 22 } }, { - "filename": "225s", + "filename": "225", "rotated": false, "trimmed": true, "sourceSize": { @@ -3139,7 +3139,7 @@ } }, { - "filename": "229", + "filename": "225s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3147,20 +3147,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, + "x": 11, "y": 5, - "w": 20, + "w": 19, "h": 23 }, "frame": { "x": 93, - "y": 239, - "w": 20, + "y": 240, + "w": 19, "h": 23 } }, { - "filename": "229s", + "filename": "221s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3169,15 +3169,57 @@ }, "spriteSourceSize": { "x": 10, - "y": 5, - "w": 20, - "h": 23 + "y": 7, + "w": 22, + "h": 21 }, "frame": { - "x": 113, + "x": 112, "y": 228, - "w": 20, - "h": 23 + "w": 22, + "h": 21 + } + }, + { + "filename": "222", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 21, + "h": 20 + }, + "frame": { + "x": 134, + "y": 232, + "w": 21, + "h": 20 + } + }, + { + "filename": "158", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 10, + "w": 18, + "h": 18 + }, + "frame": { + "x": 155, + "y": 242, + "w": 18, + "h": 18 } }, { @@ -3195,54 +3237,12 @@ "h": 20 }, "frame": { - "x": 133, - "y": 232, + "x": 112, + "y": 249, "w": 21, "h": 20 } }, - { - "filename": "166", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 7, - "w": 19, - "h": 21 - }, - "frame": { - "x": 154, - "y": 241, - "w": 19, - "h": 21 - } - }, - { - "filename": "155", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 10, - "w": 20, - "h": 18 - }, - "frame": { - "x": 113, - "y": 251, - "w": 20, - "h": 18 - } - }, { "filename": "224", "rotated": false, @@ -3265,7 +3265,7 @@ } }, { - "filename": "155s", + "filename": "224s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3274,15 +3274,120 @@ }, "spriteSourceSize": { "x": 10, - "y": 10, + "y": 7, + "w": 21, + "h": 21 + }, + "frame": { + "x": 154, + "y": 260, + "w": 21, + "h": 21 + } + }, + { + "filename": "241", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 21, + "h": 22 + }, + "frame": { + "x": 175, + "y": 260, + "w": 21, + "h": 22 + } + }, + { + "filename": "229s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, "w": 20, - "h": 18 + "h": 23 + }, + "frame": { + "x": 196, + "y": 260, + "w": 20, + "h": 23 + } + }, + { + "filename": "239", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 21, + "h": 20 + }, + "frame": { + "x": 216, + "y": 267, + "w": 21, + "h": 20 + } + }, + { + "filename": "202", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 18, + "h": 21 + }, + "frame": { + "x": 237, + "y": 277, + "w": 18, + "h": 21 + } + }, + { + "filename": "166", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 19, + "h": 21 }, "frame": { "x": 93, - "y": 262, - "w": 20, - "h": 18 + "y": 263, + "w": 19, + "h": 21 } }, { @@ -3306,111 +3411,6 @@ "h": 21 } }, - { - "filename": "194", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 11, - "w": 20, - "h": 17 - }, - "frame": { - "x": 113, - "y": 269, - "w": 20, - "h": 17 - } - }, - { - "filename": "224s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 21, - "h": 21 - }, - "frame": { - "x": 133, - "y": 273, - "w": 21, - "h": 21 - } - }, - { - "filename": "241", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 21, - "h": 22 - }, - "frame": { - "x": 154, - "y": 262, - "w": 21, - "h": 22 - } - }, - { - "filename": "192", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 19, - "h": 21 - }, - "frame": { - "x": 175, - "y": 256, - "w": 19, - "h": 21 - } - }, - { - "filename": "239", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 21, - "h": 20 - }, - "frame": { - "x": 194, - "y": 259, - "w": 21, - "h": 20 - } - }, { "filename": "239s", "rotated": false, @@ -3426,96 +3426,12 @@ "h": 20 }, "frame": { - "x": 215, - "y": 270, + "x": 112, + "y": 269, "w": 21, "h": 20 } }, - { - "filename": "178s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 7, - "w": 17, - "h": 21 - }, - "frame": { - "x": 236, - "y": 278, - "w": 17, - "h": 21 - } - }, - { - "filename": "194s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 11, - "w": 20, - "h": 17 - }, - "frame": { - "x": 93, - "y": 280, - "w": 20, - "h": 17 - } - }, - { - "filename": "197", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 20, - "h": 21 - }, - "frame": { - "x": 113, - "y": 286, - "w": 20, - "h": 21 - } - }, - { - "filename": "197s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 20, - "h": 21 - }, - "frame": { - "x": 73, - "y": 287, - "w": 20, - "h": 21 - } - }, { "filename": "241s", "rotated": false, @@ -3531,12 +3447,117 @@ "h": 22 }, "frame": { - "x": 72, - "y": 308, + "x": 133, + "y": 273, "w": 21, "h": 22 } }, + { + "filename": "155", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 10, + "w": 20, + "h": 18 + }, + "frame": { + "x": 154, + "y": 281, + "w": 20, + "h": 18 + } + }, + { + "filename": "155s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 10, + "w": 20, + "h": 18 + }, + "frame": { + "x": 174, + "y": 282, + "w": 20, + "h": 18 + } + }, + { + "filename": "194", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 11, + "w": 20, + "h": 17 + }, + "frame": { + "x": 194, + "y": 283, + "w": 20, + "h": 17 + } + }, + { + "filename": "194s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 11, + "w": 20, + "h": 17 + }, + "frame": { + "x": 214, + "y": 287, + "w": 20, + "h": 17 + } + }, + { + "filename": "188", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 11, + "w": 19, + "h": 17 + }, + "frame": { + "x": 93, + "y": 284, + "w": 19, + "h": 17 + } + }, { "filename": "231s", "rotated": false, @@ -3552,12 +3573,54 @@ "h": 16 }, "frame": { - "x": 93, - "y": 297, + "x": 73, + "y": 287, "w": 20, "h": 16 } }, + { + "filename": "192", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 19, + "h": 21 + }, + "frame": { + "x": 72, + "y": 303, + "w": 19, + "h": 21 + } + }, + { + "filename": "188s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 11, + "w": 19, + "h": 17 + }, + "frame": { + "x": 112, + "y": 289, + "w": 19, + "h": 17 + } + }, { "filename": "192s", "rotated": false, @@ -3574,7 +3637,7 @@ }, "frame": { "x": 74, - "y": 330, + "y": 324, "w": 19, "h": 21 } @@ -3594,8 +3657,8 @@ "h": 21 }, "frame": { - "x": 93, - "y": 313, + "x": 74, + "y": 345, "w": 19, "h": 21 } @@ -3616,32 +3679,11 @@ }, "frame": { "x": 74, - "y": 351, + "y": 366, "w": 19, "h": 21 } }, - { - "filename": "202s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 7, - "w": 18, - "h": 21 - }, - "frame": { - "x": 93, - "y": 334, - "w": 18, - "h": 21 - } - }, { "filename": "228", "rotated": false, @@ -3658,11 +3700,200 @@ }, "frame": { "x": 74, - "y": 372, + "y": 387, "w": 19, "h": 20 } }, + { + "filename": "202s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 18, + "h": 21 + }, + "frame": { + "x": 74, + "y": 407, + "w": 18, + "h": 21 + } + }, + { + "filename": "182", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 7, + "w": 16, + "h": 21 + }, + "frame": { + "x": 76, + "y": 428, + "w": 16, + "h": 21 + } + }, + { + "filename": "220s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 15, + "w": 18, + "h": 13 + }, + "frame": { + "x": 76, + "y": 449, + "w": 18, + "h": 13 + } + }, + { + "filename": "228s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 19, + "h": 20 + }, + "frame": { + "x": 131, + "y": 295, + "w": 19, + "h": 20 + } + }, + { + "filename": "233", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 11, + "w": 19, + "h": 17 + }, + "frame": { + "x": 150, + "y": 299, + "w": 19, + "h": 17 + } + }, + { + "filename": "233s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 11, + "w": 19, + "h": 17 + }, + "frame": { + "x": 169, + "y": 300, + "w": 19, + "h": 17 + } + }, + { + "filename": "158s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 10, + "w": 18, + "h": 18 + }, + "frame": { + "x": 188, + "y": 300, + "w": 18, + "h": 18 + } + }, + { + "filename": "182s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 7, + "w": 16, + "h": 21 + }, + "frame": { + "x": 91, + "y": 303, + "w": 16, + "h": 21 + } + }, + { + "filename": "163s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 17, + "h": 20 + }, + "frame": { + "x": 93, + "y": 324, + "w": 17, + "h": 20 + } + }, { "filename": "201-m", "rotated": false, @@ -3679,13 +3910,13 @@ }, "frame": { "x": 93, - "y": 355, + "y": 344, "w": 18, "h": 20 } }, { - "filename": "158", + "filename": "201s-m", "rotated": false, "trimmed": true, "sourceSize": { @@ -3693,121 +3924,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 10, + "x": 11, + "y": 8, "w": 18, - "h": 18 + "h": 20 }, "frame": { "x": 93, - "y": 375, + "y": 364, "w": 18, - "h": 18 - } - }, - { - "filename": "188", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 11, - "w": 19, - "h": 17 - }, - "frame": { - "x": 133, - "y": 294, - "w": 19, - "h": 17 - } - }, - { - "filename": "188s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 11, - "w": 19, - "h": 17 - }, - "frame": { - "x": 154, - "y": 284, - "w": 19, - "h": 17 - } - }, - { - "filename": "228s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 19, "h": 20 - }, - "frame": { - "x": 175, - "y": 277, - "w": 19, - "h": 20 - } - }, - { - "filename": "158s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 10, - "w": 18, - "h": 18 - }, - "frame": { - "x": 194, - "y": 279, - "w": 18, - "h": 18 - } - }, - { - "filename": "233", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 11, - "w": 19, - "h": 17 - }, - "frame": { - "x": 74, - "y": 392, - "w": 19, - "h": 17 } }, { @@ -3826,34 +3952,13 @@ }, "frame": { "x": 93, - "y": 393, + "y": 384, "w": 18, "h": 19 } }, { - "filename": "233s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 11, - "w": 19, - "h": 17 - }, - "frame": { - "x": 74, - "y": 409, - "w": 19, - "h": 17 - } - }, - { - "filename": "167", + "filename": "177", "rotated": false, "trimmed": true, "sourceSize": { @@ -3862,61 +3967,19 @@ }, "spriteSourceSize": { "x": 11, - "y": 14, - "w": 18, - "h": 14 + "y": 10, + "w": 17, + "h": 18 }, "frame": { - "x": 93, - "y": 412, - "w": 18, - "h": 14 + "x": 107, + "y": 306, + "w": 17, + "h": 18 } }, { - "filename": "201s-m", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 18, - "h": 20 - }, - "frame": { - "x": 76, - "y": 426, - "w": 18, - "h": 20 - } - }, - { - "filename": "201-u", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 12, - "w": 18, - "h": 16 - }, - "frame": { - "x": 76, - "y": 446, - "w": 18, - "h": 16 - } - }, - { - "filename": "215", + "filename": "201-e", "rotated": false, "trimmed": true, "sourceSize": { @@ -3925,19 +3988,19 @@ }, "spriteSourceSize": { "x": 12, - "y": 7, - "w": 17, - "h": 21 + "y": 8, + "w": 14, + "h": 20 }, "frame": { - "x": 94, - "y": 426, - "w": 17, - "h": 21 + "x": 110, + "y": 324, + "w": 14, + "h": 20 } }, { - "filename": "167s", + "filename": "236s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3945,16 +4008,58 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 14, - "w": 18, - "h": 14 + "x": 14, + "y": 7, + "w": 13, + "h": 21 }, "frame": { - "x": 94, - "y": 447, - "w": 18, - "h": 14 + "x": 111, + "y": 344, + "w": 13, + "h": 21 + } + }, + { + "filename": "201-k", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 13, + "h": 20 + }, + "frame": { + "x": 111, + "y": 365, + "w": 13, + "h": 20 + } + }, + { + "filename": "152", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 9, + "w": 15, + "h": 19 + }, + "frame": { + "x": 111, + "y": 385, + "w": 15, + "h": 19 } }, { @@ -3972,8 +4077,8 @@ "h": 19 }, "frame": { - "x": 152, - "y": 301, + "x": 124, + "y": 315, "w": 18, "h": 19 } @@ -3993,8 +4098,8 @@ "h": 19 }, "frame": { - "x": 113, - "y": 307, + "x": 124, + "y": 334, "w": 18, "h": 19 } @@ -4014,705 +4119,12 @@ "h": 19 }, "frame": { - "x": 131, - "y": 311, + "x": 124, + "y": 353, "w": 18, "h": 19 } }, - { - "filename": "201s-u", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 12, - "w": 18, - "h": 16 - }, - "frame": { - "x": 112, - "y": 326, - "w": 18, - "h": 16 - } - }, - { - "filename": "215s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 7, - "w": 17, - "h": 21 - }, - "frame": { - "x": 111, - "y": 342, - "w": 17, - "h": 21 - } - }, - { - "filename": "218", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 7, - "w": 17, - "h": 21 - }, - "frame": { - "x": 111, - "y": 363, - "w": 17, - "h": 21 - } - }, - { - "filename": "218s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 7, - "w": 17, - "h": 21 - }, - "frame": { - "x": 111, - "y": 384, - "w": 17, - "h": 21 - } - }, - { - "filename": "163", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 17, - "h": 20 - }, - "frame": { - "x": 111, - "y": 405, - "w": 17, - "h": 20 - } - }, - { - "filename": "163s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 17, - "h": 20 - }, - "frame": { - "x": 111, - "y": 425, - "w": 17, - "h": 20 - } - }, - { - "filename": "201-w", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 11, - "w": 17, - "h": 17 - }, - "frame": { - "x": 112, - "y": 445, - "w": 17, - "h": 17 - } - }, - { - "filename": "220s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 15, - "w": 18, - "h": 13 - }, - "frame": { - "x": 130, - "y": 330, - "w": 18, - "h": 13 - } - }, - { - "filename": "182", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 7, - "w": 16, - "h": 21 - }, - "frame": { - "x": 128, - "y": 343, - "w": 16, - "h": 21 - } - }, - { - "filename": "182s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 7, - "w": 16, - "h": 21 - }, - "frame": { - "x": 128, - "y": 364, - "w": 16, - "h": 21 - } - }, - { - "filename": "216", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 16, - "h": 20 - }, - "frame": { - "x": 128, - "y": 385, - "w": 16, - "h": 20 - } - }, - { - "filename": "216s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 16, - "h": 20 - }, - "frame": { - "x": 128, - "y": 405, - "w": 16, - "h": 20 - } - }, - { - "filename": "240", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 16, - "h": 20 - }, - "frame": { - "x": 128, - "y": 425, - "w": 16, - "h": 20 - } - }, - { - "filename": "201s-w", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 11, - "w": 17, - "h": 17 - }, - "frame": { - "x": 129, - "y": 445, - "w": 17, - "h": 17 - } - }, - { - "filename": "201s-a", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 15, - "y": 7, - "w": 10, - "h": 21 - }, - "frame": { - "x": 144, - "y": 343, - "w": 10, - "h": 21 - } - }, - { - "filename": "201s-b", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 14, - "y": 7, - "w": 12, - "h": 21 - }, - "frame": { - "x": 144, - "y": 364, - "w": 12, - "h": 21 - } - }, - { - "filename": "201s-e", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 14, - "h": 20 - }, - "frame": { - "x": 144, - "y": 385, - "w": 14, - "h": 20 - } - }, - { - "filename": "238", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 14, - "h": 20 - }, - "frame": { - "x": 144, - "y": 405, - "w": 14, - "h": 20 - } - }, - { - "filename": "238s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 14, - "h": 20 - }, - "frame": { - "x": 144, - "y": 425, - "w": 14, - "h": 20 - } - }, - { - "filename": "173", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 12, - "w": 16, - "h": 16 - }, - "frame": { - "x": 146, - "y": 445, - "w": 16, - "h": 16 - } - }, - { - "filename": "177", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 10, - "w": 17, - "h": 18 - }, - "frame": { - "x": 149, - "y": 320, - "w": 17, - "h": 18 - } - }, - { - "filename": "201s-l", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 13, - "h": 20 - }, - "frame": { - "x": 154, - "y": 338, - "w": 13, - "h": 20 - } - }, - { - "filename": "201s-question", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 14, - "y": 7, - "w": 11, - "h": 21 - }, - "frame": { - "x": 156, - "y": 358, - "w": 11, - "h": 21 - } - }, - { - "filename": "201s-g", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 15, - "y": 7, - "w": 10, - "h": 21 - }, - "frame": { - "x": 158, - "y": 379, - "w": 10, - "h": 21 - } - }, - { - "filename": "201-exclamation", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 14, - "y": 8, - "w": 10, - "h": 20 - }, - "frame": { - "x": 158, - "y": 400, - "w": 10, - "h": 20 - } - }, - { - "filename": "201-i", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 15, - "y": 8, - "w": 10, - "h": 20 - }, - "frame": { - "x": 158, - "y": 420, - "w": 10, - "h": 20 - } - }, - { - "filename": "165", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 10, - "w": 16, - "h": 18 - }, - "frame": { - "x": 166, - "y": 320, - "w": 16, - "h": 18 - } - }, - { - "filename": "240s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 16, - "h": 20 - }, - "frame": { - "x": 167, - "y": 338, - "w": 16, - "h": 20 - } - }, - { - "filename": "200", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 9, - "w": 16, - "h": 19 - }, - "frame": { - "x": 167, - "y": 358, - "w": 16, - "h": 19 - } - }, - { - "filename": "152", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 9, - "w": 15, - "h": 19 - }, - "frame": { - "x": 170, - "y": 301, - "w": 15, - "h": 19 - } - }, - { - "filename": "246", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 15, - "h": 20 - }, - "frame": { - "x": 168, - "y": 377, - "w": 15, - "h": 20 - } - }, - { - "filename": "246s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 15, - "h": 20 - }, - "frame": { - "x": 168, - "y": 397, - "w": 15, - "h": 20 - } - }, - { - "filename": "152s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 9, - "w": 15, - "h": 19 - }, - "frame": { - "x": 168, - "y": 417, - "w": 15, - "h": 19 - } - }, { "filename": "204", "rotated": false, @@ -4728,33 +4140,12 @@ "h": 19 }, "frame": { - "x": 185, - "y": 297, + "x": 142, + "y": 316, "w": 17, "h": 19 } }, - { - "filename": "172", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 9, - "w": 15, - "h": 19 - }, - "frame": { - "x": 202, - "y": 297, - "w": 15, - "h": 19 - } - }, { "filename": "204s", "rotated": false, @@ -4770,8 +4161,8 @@ "h": 19 }, "frame": { - "x": 217, - "y": 290, + "x": 142, + "y": 335, "w": 17, "h": 19 } @@ -4791,14 +4182,119 @@ "h": 18 }, "frame": { - "x": 234, - "y": 299, + "x": 142, + "y": 354, "w": 17, "h": 18 } }, { - "filename": "223", + "filename": "201-a", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 15, + "y": 7, + "w": 10, + "h": 21 + }, + "frame": { + "x": 159, + "y": 316, + "w": 10, + "h": 21 + } + }, + { + "filename": "216", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 16, + "h": 20 + }, + "frame": { + "x": 169, + "y": 317, + "w": 16, + "h": 20 + } + }, + { + "filename": "216s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 16, + "h": 20 + }, + "frame": { + "x": 159, + "y": 337, + "w": 16, + "h": 20 + } + }, + { + "filename": "200", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 9, + "w": 16, + "h": 19 + }, + "frame": { + "x": 185, + "y": 318, + "w": 16, + "h": 19 + } + }, + { + "filename": "240", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 8, + "w": 16, + "h": 20 + }, + "frame": { + "x": 175, + "y": 337, + "w": 16, + "h": 20 + } + }, + { + "filename": "201-u", "rotated": false, "trimmed": true, "sourceSize": { @@ -4808,18 +4304,123 @@ "spriteSourceSize": { "x": 11, "y": 12, - "w": 17, + "w": 18, "h": 16 }, "frame": { - "x": 217, - "y": 309, - "w": 17, + "x": 159, + "y": 357, + "w": 18, "h": 16 } }, { - "filename": "223s", + "filename": "152s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 9, + "w": 15, + "h": 19 + }, + "frame": { + "x": 177, + "y": 357, + "w": 15, + "h": 19 + } + }, + { + "filename": "201-exclamation", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 8, + "w": 10, + "h": 20 + }, + "frame": { + "x": 191, + "y": 337, + "w": 10, + "h": 20 + } + }, + { + "filename": "172-spiky", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 9, + "w": 15, + "h": 19 + }, + "frame": { + "x": 192, + "y": 357, + "w": 15, + "h": 19 + } + }, + { + "filename": "201-g", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 15, + "y": 7, + "w": 10, + "h": 21 + }, + "frame": { + "x": 201, + "y": 318, + "w": 10, + "h": 21 + } + }, + { + "filename": "165", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 10, + "w": 16, + "h": 18 + }, + "frame": { + "x": 201, + "y": 339, + "w": 16, + "h": 18 + } + }, + { + "filename": "167", "rotated": false, "trimmed": true, "sourceSize": { @@ -4828,15 +4429,57 @@ }, "spriteSourceSize": { "x": 11, - "y": 12, - "w": 17, - "h": 16 + "y": 14, + "w": 18, + "h": 14 }, "frame": { - "x": 234, - "y": 317, - "w": 17, - "h": 16 + "x": 206, + "y": 304, + "w": 18, + "h": 14 + } + }, + { + "filename": "201s-b", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 7, + "w": 12, + "h": 21 + }, + "frame": { + "x": 211, + "y": 318, + "w": 12, + "h": 21 + } + }, + { + "filename": "172", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 9, + "w": 15, + "h": 19 + }, + "frame": { + "x": 207, + "y": 357, + "w": 15, + "h": 19 } }, { @@ -4854,14 +4497,56 @@ "h": 18 }, "frame": { - "x": 182, - "y": 320, + "x": 217, + "y": 339, "w": 16, "h": 18 } }, { - "filename": "172s", + "filename": "201s-a", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 15, + "y": 7, + "w": 10, + "h": 21 + }, + "frame": { + "x": 223, + "y": 318, + "w": 10, + "h": 21 + } + }, + { + "filename": "167s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 14, + "w": 18, + "h": 14 + }, + "frame": { + "x": 224, + "y": 304, + "w": 18, + "h": 14 + } + }, + { + "filename": "201-l", "rotated": false, "trimmed": true, "sourceSize": { @@ -4870,15 +4555,36 @@ }, "spriteSourceSize": { "x": 13, - "y": 9, - "w": 15, - "h": 19 + "y": 8, + "w": 13, + "h": 20 }, "frame": { - "x": 183, - "y": 338, - "w": 15, - "h": 19 + "x": 242, + "y": 298, + "w": 13, + "h": 20 + } + }, + { + "filename": "240s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 8, + "w": 16, + "h": 20 + }, + "frame": { + "x": 233, + "y": 318, + "w": 16, + "h": 20 } }, { @@ -4896,8 +4602,8 @@ "h": 19 }, "frame": { - "x": 183, - "y": 357, + "x": 233, + "y": 338, "w": 16, "h": 19 } @@ -4917,12 +4623,75 @@ "h": 19 }, "frame": { - "x": 183, - "y": 376, + "x": 222, + "y": 357, "w": 16, "h": 19 } }, + { + "filename": "201-w", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 11, + "w": 17, + "h": 17 + }, + "frame": { + "x": 238, + "y": 357, + "w": 17, + "h": 17 + } + }, + { + "filename": "201s-w", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 11, + "w": 17, + "h": 17 + }, + "frame": { + "x": 238, + "y": 374, + "w": 17, + "h": 17 + } + }, + { + "filename": "201s-u", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 12, + "w": 18, + "h": 16 + }, + "frame": { + "x": 93, + "y": 403, + "w": 18, + "h": 16 + } + }, { "filename": "247s", "rotated": false, @@ -4938,12 +4707,96 @@ "h": 19 }, "frame": { - "x": 183, - "y": 395, + "x": 92, + "y": 419, "w": 16, "h": 19 } }, + { + "filename": "172s-spiky", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 9, + "w": 15, + "h": 19 + }, + "frame": { + "x": 111, + "y": 404, + "w": 15, + "h": 19 + } + }, + { + "filename": "223", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 12, + "w": 17, + "h": 16 + }, + "frame": { + "x": 108, + "y": 423, + "w": 17, + "h": 16 + } + }, + { + "filename": "201s-e", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 8, + "w": 14, + "h": 20 + }, + "frame": { + "x": 94, + "y": 438, + "w": 14, + "h": 20 + } + }, + { + "filename": "172s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 9, + "w": 15, + "h": 19 + }, + "frame": { + "x": 108, + "y": 439, + "w": 15, + "h": 19 + } + }, { "filename": "175", "rotated": false, @@ -4959,8 +4812,8 @@ "h": 18 }, "frame": { - "x": 183, - "y": 414, + "x": 126, + "y": 372, "w": 16, "h": 18 } @@ -4980,8 +4833,8 @@ "h": 18 }, "frame": { - "x": 198, - "y": 316, + "x": 142, + "y": 372, "w": 16, "h": 18 } @@ -5001,33 +4854,12 @@ "h": 19 }, "frame": { - "x": 198, - "y": 334, + "x": 126, + "y": 390, "w": 15, "h": 19 } }, - { - "filename": "201s-d", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 14, - "y": 9, - "w": 14, - "h": 19 - }, - "frame": { - "x": 199, - "y": 353, - "w": 14, - "h": 19 - } - }, { "filename": "201s-f", "rotated": false, @@ -5043,14 +4875,14 @@ "h": 19 }, "frame": { - "x": 199, - "y": 372, + "x": 141, + "y": 390, "w": 15, "h": 19 } }, { - "filename": "174", + "filename": "223s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5058,20 +4890,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 10, - "w": 15, - "h": 18 + "x": 11, + "y": 12, + "w": 17, + "h": 16 }, "frame": { - "x": 199, - "y": 391, - "w": 15, - "h": 18 + "x": 158, + "y": 373, + "w": 17, + "h": 16 } }, { - "filename": "174s", + "filename": "173", "rotated": false, "trimmed": true, "sourceSize": { @@ -5080,15 +4912,15 @@ }, "spriteSourceSize": { "x": 12, - "y": 10, - "w": 15, - "h": 18 + "y": 12, + "w": 16, + "h": 16 }, "frame": { - "x": 199, + "x": 126, "y": 409, - "w": 15, - "h": 18 + "w": 16, + "h": 16 } }, { @@ -5106,14 +4938,14 @@ "h": 16 }, "frame": { - "x": 214, - "y": 325, + "x": 142, + "y": 409, "w": 16, "h": 16 } }, { - "filename": "201-v", + "filename": "174", "rotated": false, "trimmed": true, "sourceSize": { @@ -5121,20 +4953,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 13, + "x": 12, "y": 10, - "w": 14, + "w": 15, "h": 18 }, "frame": { - "x": 213, - "y": 341, - "w": 14, + "x": 125, + "y": 425, + "w": 15, "h": 18 } }, { - "filename": "191", + "filename": "201s-d", "rotated": false, "trimmed": true, "sourceSize": { @@ -5142,16 +4974,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 13, - "y": 10, - "w": 13, - "h": 18 + "x": 14, + "y": 9, + "w": 14, + "h": 19 }, "frame": { - "x": 227, - "y": 341, - "w": 13, - "h": 18 + "x": 123, + "y": 443, + "w": 14, + "h": 19 } }, { @@ -5169,12 +5001,33 @@ "h": 19 }, "frame": { - "x": 240, - "y": 333, + "x": 137, + "y": 443, "w": 13, "h": 19 } }, + { + "filename": "174s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 10, + "w": 15, + "h": 18 + }, + "frame": { + "x": 140, + "y": 425, + "w": 15, + "h": 18 + } + }, { "filename": "201s-y", "rotated": false, @@ -5190,77 +5043,14 @@ "h": 19 }, "frame": { - "x": 240, - "y": 352, + "x": 150, + "y": 443, "w": 13, "h": 19 } }, { - "filename": "201-p", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 15, - "y": 8, - "w": 11, - "h": 20 - }, - "frame": { - "x": 162, - "y": 440, - "w": 11, - "h": 20 - } - }, - { - "filename": "201s-exclamation", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 14, - "y": 8, - "w": 10, - "h": 20 - }, - "frame": { - "x": 173, - "y": 436, - "w": 10, - "h": 20 - } - }, - { - "filename": "201s-v", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 10, - "w": 14, - "h": 18 - }, - "frame": { - "x": 183, - "y": 432, - "w": 14, - "h": 18 - } - }, - { - "filename": "191s", + "filename": "191", "rotated": false, "trimmed": true, "sourceSize": { @@ -5274,96 +5064,12 @@ "h": 18 }, "frame": { - "x": 197, - "y": 432, + "x": 155, + "y": 425, "w": 13, "h": 18 } }, - { - "filename": "201s-i", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 15, - "y": 8, - "w": 10, - "h": 20 - }, - "frame": { - "x": 214, - "y": 371, - "w": 10, - "h": 20 - } - }, - { - "filename": "201s-p", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 15, - "y": 8, - "w": 11, - "h": 20 - }, - "frame": { - "x": 214, - "y": 391, - "w": 11, - "h": 20 - } - }, - { - "filename": "201-q", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 12, - "w": 14, - "h": 16 - }, - "frame": { - "x": 214, - "y": 411, - "w": 14, - "h": 16 - } - }, - { - "filename": "251", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 9, - "w": 14, - "h": 18 - }, - "frame": { - "x": 210, - "y": 427, - "w": 14, - "h": 18 - } - }, { "filename": "201-t", "rotated": false, @@ -5379,8 +5085,176 @@ "h": 19 }, "frame": { - "x": 228, - "y": 359, + "x": 163, + "y": 443, + "w": 12, + "h": 19 + } + }, + { + "filename": "201-q", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 12, + "w": 14, + "h": 16 + }, + "frame": { + "x": 175, + "y": 376, + "w": 14, + "h": 16 + } + }, + { + "filename": "201-v", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 10, + "w": 14, + "h": 18 + }, + "frame": { + "x": 189, + "y": 376, + "w": 14, + "h": 18 + } + }, + { + "filename": "201s-v", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 10, + "w": 14, + "h": 18 + }, + "frame": { + "x": 203, + "y": 376, + "w": 14, + "h": 18 + } + }, + { + "filename": "238", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 14, + "h": 20 + }, + "frame": { + "x": 217, + "y": 376, + "w": 14, + "h": 20 + } + }, + { + "filename": "201-z", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 15, + "y": 9, + "w": 10, + "h": 19 + }, + "frame": { + "x": 156, + "y": 390, + "w": 10, + "h": 19 + } + }, + { + "filename": "201s-q", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 12, + "w": 14, + "h": 16 + }, + "frame": { + "x": 158, + "y": 409, + "w": 14, + "h": 16 + } + }, + { + "filename": "191s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 10, + "w": 13, + "h": 18 + }, + "frame": { + "x": 168, + "y": 425, + "w": 13, + "h": 18 + } + }, + { + "filename": "201s-t", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 9, + "w": 12, + "h": 19 + }, + "frame": { + "x": 175, + "y": 443, "w": 12, "h": 19 } @@ -5400,96 +5274,12 @@ "h": 14 }, "frame": { - "x": 240, - "y": 371, + "x": 166, + "y": 392, "w": 13, "h": 14 } }, - { - "filename": "201-r", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 16, - "y": 10, - "w": 10, - "h": 18 - }, - "frame": { - "x": 224, - "y": 427, - "w": 10, - "h": 18 - } - }, - { - "filename": "201s-q", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 12, - "w": 14, - "h": 16 - }, - "frame": { - "x": 210, - "y": 445, - "w": 14, - "h": 16 - } - }, - { - "filename": "201s-x", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 14, - "y": 14, - "w": 13, - "h": 14 - }, - "frame": { - "x": 224, - "y": 445, - "w": 13, - "h": 14 - } - }, - { - "filename": "201s-t", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 9, - "w": 12, - "h": 19 - }, - "frame": { - "x": 228, - "y": 378, - "w": 12, - "h": 19 - } - }, { "filename": "201s-j", "rotated": false, @@ -5505,14 +5295,14 @@ "h": 19 }, "frame": { - "x": 240, - "y": 385, + "x": 172, + "y": 406, "w": 11, "h": 19 } }, { - "filename": "201-z", + "filename": "201-r", "rotated": false, "trimmed": true, "sourceSize": { @@ -5520,36 +5310,15 @@ "h": 30 }, "spriteSourceSize": { - "x": 15, - "y": 9, + "x": 16, + "y": 10, "w": 10, - "h": 19 - }, - "frame": { - "x": 228, - "y": 397, - "w": 10, - "h": 19 - } - }, - { - "filename": "251s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 9, - "w": 14, "h": 18 }, "frame": { - "x": 238, - "y": 404, - "w": 14, + "x": 181, + "y": 425, + "w": 10, "h": 18 } }, @@ -5568,12 +5337,264 @@ "h": 19 }, "frame": { - "x": 234, - "y": 422, + "x": 187, + "y": 443, "w": 10, "h": 19 } }, + { + "filename": "238s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 14, + "h": 20 + }, + "frame": { + "x": 183, + "y": 394, + "w": 14, + "h": 20 + } + }, + { + "filename": "201s-k", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 13, + "h": 20 + }, + "frame": { + "x": 197, + "y": 394, + "w": 13, + "h": 20 + } + }, + { + "filename": "251", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 9, + "w": 14, + "h": 18 + }, + "frame": { + "x": 210, + "y": 396, + "w": 14, + "h": 18 + } + }, + { + "filename": "201-i", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 15, + "y": 8, + "w": 10, + "h": 20 + }, + "frame": { + "x": 224, + "y": 396, + "w": 10, + "h": 20 + } + }, + { + "filename": "201s-l", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 13, + "h": 20 + }, + "frame": { + "x": 234, + "y": 391, + "w": 13, + "h": 20 + } + }, + { + "filename": "201s-question", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 7, + "w": 11, + "h": 21 + }, + "frame": { + "x": 191, + "y": 414, + "w": 11, + "h": 21 + } + }, + { + "filename": "251s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 9, + "w": 14, + "h": 18 + }, + "frame": { + "x": 202, + "y": 414, + "w": 14, + "h": 18 + } + }, + { + "filename": "201-p", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 15, + "y": 8, + "w": 11, + "h": 20 + }, + "frame": { + "x": 216, + "y": 416, + "w": 11, + "h": 20 + } + }, + { + "filename": "201s-exclamation", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 8, + "w": 10, + "h": 20 + }, + "frame": { + "x": 227, + "y": 416, + "w": 10, + "h": 20 + } + }, + { + "filename": "201s-g", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 15, + "y": 7, + "w": 10, + "h": 21 + }, + "frame": { + "x": 237, + "y": 411, + "w": 10, + "h": 21 + } + }, + { + "filename": "201s-i", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 15, + "y": 8, + "w": 10, + "h": 20 + }, + "frame": { + "x": 197, + "y": 435, + "w": 10, + "h": 20 + } + }, + { + "filename": "201s-p", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 15, + "y": 8, + "w": 11, + "h": 20 + }, + "frame": { + "x": 207, + "y": 436, + "w": 11, + "h": 20 + } + }, { "filename": "201s-r", "rotated": false, @@ -5589,11 +5610,32 @@ "h": 18 }, "frame": { - "x": 237, - "y": 441, + "x": 218, + "y": 436, "w": 10, "h": 18 } + }, + { + "filename": "201s-x", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 14, + "w": 13, + "h": 14 + }, + "frame": { + "x": 228, + "y": 436, + "w": 13, + "h": 14 + } } ] } @@ -5601,6 +5643,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:381d94be4c698af95a0dce4a480b2d7d:4669a98fe04cb61eb30af8c9106e5dd3:c4863c5093a921f7cedf2f07c8e4b312$" + "smartupdate": "$TexturePacker:SmartUpdate:24c0e043b77bb41bcd335b45d511469e:5ea4e40521f9e8df97120dca6c6a75d4:c4863c5093a921f7cedf2f07c8e4b312$" } } diff --git a/public/images/pokemon_icons_2.png b/public/images/pokemon_icons_2.png index e29077e0a..1be4d74bb 100644 Binary files a/public/images/pokemon_icons_2.png and b/public/images/pokemon_icons_2.png differ diff --git a/src/data/pokemon-evolutions.ts b/src/data/pokemon-evolutions.ts index 39d2d28ed..290deb39e 100644 --- a/src/data/pokemon-evolutions.ts +++ b/src/data/pokemon-evolutions.ts @@ -1553,7 +1553,7 @@ export const pokemonEvolutions: PokemonEvolutions = { new SpeciesEvolution(Species.BLISSEY, 1, null, new SpeciesFriendshipEvolutionCondition(200), SpeciesWildEvolutionDelay.LONG) ], [Species.PICHU]: [ - new SpeciesEvolution(Species.PIKACHU, 1, null, new SpeciesFriendshipEvolutionCondition(70), SpeciesWildEvolutionDelay.SHORT) + new SpeciesEvolution(Species.PIKACHU, 1, null, new SpeciesFriendshipEvolutionCondition(90), SpeciesWildEvolutionDelay.SHORT) ], [Species.CLEFFA]: [ new SpeciesEvolution(Species.CLEFAIRY, 1, null, new SpeciesFriendshipEvolutionCondition(160), SpeciesWildEvolutionDelay.SHORT) diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts index 2ad34f0b0..02c259d50 100644 --- a/src/data/pokemon-species.ts +++ b/src/data/pokemon-species.ts @@ -922,7 +922,10 @@ export function initSpecies() { new PokemonSpecies(Species.CROBAT, "Crobat", 2, false, false, false, "Bat Pokémon", Type.POISON, Type.FLYING, 1.8, 75, Abilities.INNER_FOCUS, Abilities.NONE, Abilities.INFILTRATOR, 535, 85, 90, 80, 70, 80, 130, 90, 50, 268, GrowthRate.MEDIUM_FAST, 50, false), new PokemonSpecies(Species.CHINCHOU, "Chinchou", 2, false, false, false, "Angler Pokémon", Type.WATER, Type.ELECTRIC, 0.5, 12, Abilities.VOLT_ABSORB, Abilities.ILLUMINATE, Abilities.WATER_ABSORB, 330, 75, 38, 38, 56, 56, 67, 190, 50, 66, GrowthRate.SLOW, 50, false), new PokemonSpecies(Species.LANTURN, "Lanturn", 2, false, false, false, "Light Pokémon", Type.WATER, Type.ELECTRIC, 1.2, 22.5, Abilities.VOLT_ABSORB, Abilities.ILLUMINATE, Abilities.WATER_ABSORB, 460, 125, 58, 58, 76, 76, 67, 75, 50, 161, GrowthRate.SLOW, 50, false), - new PokemonSpecies(Species.PICHU, "Pichu", 2, false, false, false, "Tiny Mouse Pokémon", Type.ELECTRIC, null, 0.3, 2, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 205, 20, 40, 15, 35, 35, 60, 190, 50, 41, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.PICHU, "Pichu", 2, false, false, false, "Tiny Mouse Pokémon", Type.ELECTRIC, null, 0.3, 2, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 205, 20, 40, 15, 35, 35, 60, 190, 70, 41, GrowthRate.MEDIUM_FAST, 50, false, false, + new PokemonForm("Normal", "", Type.ELECTRIC, null, 1.4, 61.5, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 205, 20, 40, 15, 35, 35, 60, 190, 70, 41), + new PokemonForm("Spiky-Eared", "spiky", Type.ELECTRIC, null, 1.4, 61.5, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 205, 20, 40, 15, 35, 35, 60, 190, 70, 41), + ), new PokemonSpecies(Species.CLEFFA, "Cleffa", 2, false, false, false, "Star Shape Pokémon", Type.FAIRY, null, 0.3, 3, Abilities.CUTE_CHARM, Abilities.MAGIC_GUARD, Abilities.FRIEND_GUARD, 218, 50, 25, 28, 45, 55, 15, 150, 140, 44, GrowthRate.FAST, 25, false), new PokemonSpecies(Species.IGGLYBUFF, "Igglybuff", 2, false, false, false, "Balloon Pokémon", Type.NORMAL, Type.FAIRY, 0.3, 1, Abilities.CUTE_CHARM, Abilities.COMPETITIVE, Abilities.FRIEND_GUARD, 210, 90, 30, 15, 40, 20, 15, 170, 50, 42, GrowthRate.FAST, 25, false), new PokemonSpecies(Species.TOGEPI, "Togepi", 2, false, false, false, "Spike Ball Pokémon", Type.FAIRY, null, 0.3, 1.5, Abilities.HUSTLE, Abilities.SERENE_GRACE, Abilities.SUPER_LUCK, 245, 35, 20, 65, 40, 65, 20, 190, 50, 49, GrowthRate.FAST, 87.5, false), @@ -2179,7 +2182,7 @@ export function initSpecies() { new PokemonSpecies(Species.REGIDRAGO, "Regidrago", 8, true, false, false, "Dragon Orb Pokémon", Type.DRAGON, null, 2.1, 200, Abilities.DRAGONS_MAW, Abilities.NONE, Abilities.NONE, 580, 200, 100, 50, 100, 50, 80, 3, 35, 290, GrowthRate.SLOW, null, false), new PokemonSpecies(Species.GLASTRIER, "Glastrier", 8, true, false, false, "Wild Horse Pokémon", Type.ICE, null, 2.2, 800, Abilities.CHILLING_NEIGH, Abilities.NONE, Abilities.NONE, 580, 100, 145, 130, 65, 110, 30, 3, 35, 290, GrowthRate.SLOW, null, false), new PokemonSpecies(Species.SPECTRIER, "Spectrier", 8, true, false, false, "Swift Horse Pokémon", Type.GHOST, null, 2, 44.5, Abilities.GRIM_NEIGH, Abilities.NONE, Abilities.NONE, 580, 100, 65, 60, 145, 80, 130, 3, 35, 290, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.CALYREX, "Calyrex", 8, true, false, false, "King Pokémon", Type.PSYCHIC, Type.GRASS, 1.1, 7.7, Abilities.UNNERVE, Abilities.NONE, Abilities.NONE, 500, 100, 80, 80, 80, 80, 80, 3, 100, 250, GrowthRate.SLOW, null, false, false, + new PokemonSpecies(Species.CALYREX, "Calyrex", 8, true, false, false, "King Pokémon", Type.PSYCHIC, Type.GRASS, 1.1, 7.7, Abilities.UNNERVE, Abilities.NONE, Abilities.NONE, 500, 100, 80, 80, 80, 80, 80, 3, 100, 250, GrowthRate.SLOW, null, false, true, new PokemonForm("Normal", "", Type.PSYCHIC, Type.GRASS, 1.1, 7.7, Abilities.UNNERVE, Abilities.NONE, Abilities.NONE, 500, 100, 80, 80, 80, 80, 80, 3, 100, 250), new PokemonForm("Ice", "ice", Type.PSYCHIC, Type.ICE, 2.4, 809.1, Abilities.AS_ONE_GLASTRIER, Abilities.NONE, Abilities.NONE, 680, 100, 165, 150, 85, 130, 50, 3, 100, 250), new PokemonForm("Shadow", "shadow", Type.PSYCHIC, Type.GHOST, 2.4, 53.6, Abilities.AS_ONE_SPECTRIER, Abilities.NONE, Abilities.NONE, 680, 100, 85, 80, 165, 100, 150, 3, 100, 250), diff --git a/src/data/tms.ts b/src/data/tms.ts index 03eefce77..71264d16c 100644 --- a/src/data/tms.ts +++ b/src/data/tms.ts @@ -1224,6 +1224,284 @@ export const tmSpecies: TmSpecies = { Species.HISUI_DECIDUEYE, Species.BLOODMOON_URSALUNA, ], + [Moves.CUT]: [ + Species.BULBASAUR, + Species.IVYSAUR, + Species.VENUSAUR, + Species.CHARMANDER, + Species.CHARMELEON, + Species.CHARIZARD, + Species.BEEDRILL, + Species.RATTATA, + Species.RATICATE, + Species.SANDSHREW, + Species.SANDSLASH, + Species.NIDORAN_F, + Species.NIDORINA, + Species.NIDOQUEEN, + Species.NIDORAN_M, + Species.NIDORINO, + Species.NIDOKING, + Species.ODDISH, + Species.GLOOM, + Species.VILEPLUME, + Species.PARAS, + Species.PARASECT, + Species.DIGLETT, + Species.DUGTRIO, + Species.MEOWTH, + Species.PERSIAN, + Species.BELLSPROUT, + Species.WEEPINBELL, + Species.VICTREEBEL, + Species.TENTACOOL, + Species.TENTACRUEL, + Species.FARFETCHD, + Species.KRABBY, + Species.KINGLER, + Species.LICKITUNG, + Species.RHYDON, + Species.TANGELA, + Species.KANGASKHAN, + Species.SCYTHER, + Species.PINSIR, + Species.KABUTOPS, + Species.DRAGONITE, + Species.MEW, + Species.CHIKORITA, + Species.BAYLEEF, + Species.MEGANIUM, + Species.CYNDAQUIL, + Species.QUILAVA, + Species.TYPHLOSION, + Species.TOTODILE, + Species.CROCONAW, + Species.FERALIGATR, + Species.SENTRET, + Species.FURRET, + Species.BELLOSSOM, + Species.AIPOM, + Species.SUNKERN, + Species.SUNFLORA, + Species.ESPEON, + Species.UMBREON, + Species.GLIGAR, + Species.STEELIX, + Species.SCIZOR, + Species.HERACROSS, + Species.SNEASEL, + Species.TEDDIURSA, + Species.URSARING, + Species.SKARMORY, + Species.RAIKOU, + Species.ENTEI, + Species.SUICUNE, + Species.TYRANITAR, + Species.CELEBI, + Species.TREECKO, + Species.GROVYLE, + Species.SCEPTILE, + Species.TORCHIC, + Species.COMBUSKEN, + Species.BLAZIKEN, + Species.ZIGZAGOON, + Species.LINOONE, + Species.NUZLEAF, + Species.SHIFTRY, + Species.BRELOOM, + Species.SLAKOTH, + Species.VIGOROTH, + Species.SLAKING, + Species.NINCADA, + Species.NINJASK, + Species.SHEDINJA, + Species.SABLEYE, + Species.ARON, + Species.LAIRON, + Species.AGGRON, + Species.ROSELIA, + Species.CACNEA, + Species.CACTURNE, + Species.CORPHISH, + Species.CRAWDAUNT, + Species.ANORITH, + Species.ARMALDO, + Species.KECLEON, + Species.TROPIUS, + Species.ABSOL, + Species.BAGON, + Species.SHELGON, + Species.SALAMENCE, + Species.METANG, + Species.METAGROSS, + Species.LATIAS, + Species.LATIOS, + Species.GROUDON, + Species.DEOXYS, + Species.TURTWIG, + Species.GROTLE, + Species.TORTERRA, + Species.CHIMCHAR, + Species.MONFERNO, + Species.INFERNAPE, + Species.PIPLUP, + Species.PRINPLUP, + Species.EMPOLEON, + Species.BIDOOF, + Species.BIBAREL, + Species.KRICKETUNE, + Species.BUDEW, + Species.ROSERADE, + Species.RAMPARDOS, + Species.VESPIQUEN, + Species.PACHIRISU, + Species.AMBIPOM, + Species.DRIFLOON, + Species.DRIFBLIM, + Species.BUNEARY, + Species.LOPUNNY, + Species.GLAMEOW, + Species.PURUGLY, + Species.STUNKY, + Species.SKUNTANK, + Species.GIBLE, + Species.GABITE, + Species.GARCHOMP, + Species.SKORUPI, + Species.DRAPION, + Species.TOXICROAK, + Species.CARNIVINE, + Species.WEAVILE, + Species.LICKILICKY, + Species.RHYPERIOR, + Species.TANGROWTH, + Species.GLISCOR, + Species.GALLADE, + Species.DIALGA, + Species.PALKIA, + Species.GIRATINA, + Species.DARKRAI, + Species.ARCEUS, + Species.SNIVY, + Species.SERVINE, + Species.SERPERIOR, + Species.OSHAWOTT, + Species.DEWOTT, + Species.SAMUROTT, + Species.PATRAT, + Species.WATCHOG, + Species.PURRLOIN, + Species.LIEPARD, + Species.PANSAGE, + Species.SIMISAGE, + Species.PANSEAR, + Species.SIMISEAR, + Species.PANPOUR, + Species.SIMIPOUR, + Species.DRILBUR, + Species.EXCADRILL, + Species.SEWADDLE, + Species.SWADLOON, + Species.LEAVANNY, + Species.SCOLIPEDE, + Species.PETILIL, + Species.LILLIGANT, + Species.BASCULIN, + Species.SANDILE, + Species.KROKOROK, + Species.KROOKODILE, + Species.DWEBBLE, + Species.CRUSTLE, + Species.ARCHEN, + Species.ARCHEOPS, + Species.ZORUA, + Species.ZOROARK, + Species.SAWSBUCK, + Species.EMOLGA, + Species.KARRABLAST, + Species.ESCAVALIER, + Species.JOLTIK, + Species.GALVANTULA, + Species.FERROTHORN, + Species.EELEKTROSS, + Species.AXEW, + Species.FRAXURE, + Species.HAXORUS, + Species.CUBCHOO, + Species.BEARTIC, + Species.DRUDDIGON, + Species.PAWNIARD, + Species.BISHARP, + Species.BOUFFALANT, + Species.RUFFLET, + Species.BRAVIARY, + Species.VULLABY, + Species.MANDIBUZZ, + Species.HEATMOR, + Species.DURANT, + Species.COBALION, + Species.TERRAKION, + Species.VIRIZION, + Species.RESHIRAM, + Species.ZEKROM, + Species.KYUREM, + Species.KELDEO, + Species.CHESPIN, + Species.QUILLADIN, + Species.CHESNAUGHT, + Species.FENNEKIN, + Species.BRAIXEN, + Species.DELPHOX, + Species.FROAKIE, + Species.FROGADIER, + Species.GRENINJA, + Species.BUNNELBY, + Species.DIGGERSBY, + Species.PANCHAM, + Species.PANGORO, + Species.ESPURR, + Species.MEOWSTIC, + Species.HONEDGE, + Species.DOUBLADE, + Species.AEGISLASH, + Species.INKAY, + Species.MALAMAR, + Species.BINACLE, + Species.BARBARACLE, + Species.CLAUNCHER, + Species.CLAWITZER, + Species.HELIOPTILE, + Species.HELIOLISK, + Species.SYLVEON, + Species.HAWLUCHA, + Species.DEDENNE, + Species.KLEFKI, + Species.PHANTUMP, + Species.TREVENANT, + Species.NOIBAT, + Species.NOIVERN, + Species.XERNEAS, + Species.YVELTAL, + Species.VOLCANION, + Species.KARTANA, + Species.OBSTAGOON, + Species.PERRSERKER, + Species.URSALUNA, + Species.BASCULEGION, + Species.KINGAMBIT, + Species.ALOLA_RATTATA, + Species.ALOLA_RATICATE, + Species.ALOLA_MEOWTH, + Species.ALOLA_PERSIAN, + Species.GALAR_MEOWTH, + Species.GALAR_ZIGZAGOON, + Species.GALAR_LINOONE, + Species.HISUI_TYPHLOSION, + Species.HISUI_SAMUROTT, + Species.HISUI_LILLIGANT, + Species.HISUI_BRAVIARY, + Species.BLOODMOON_URSALUNA, + ], [Moves.FLY]: [ Species.CHARIZARD, Species.PIDGEY, @@ -5839,6 +6117,390 @@ export const tmSpecies: TmSpecies = { Species.PALDEA_WOOPER, Species.BLOODMOON_URSALUNA, ], + [Moves.STRENGTH]: [ + Species.BULBASAUR, + Species.IVYSAUR, + Species.VENUSAUR, + Species.CHARMANDER, + Species.CHARMELEON, + Species.CHARIZARD, + Species.SQUIRTLE, + Species.WARTORTLE, + Species.BLASTOISE, + Species.RATICATE, + Species.EKANS, + Species.ARBOK, + Species.PIKACHU, + Species.RAICHU, + Species.SANDSHREW, + Species.SANDSLASH, + Species.NIDORAN_F, + Species.NIDORINA, + Species.NIDOQUEEN, + Species.NIDORAN_M, + Species.NIDORINO, + Species.NIDOKING, + Species.CLEFAIRY, + Species.CLEFABLE, + Species.JIGGLYPUFF, + Species.WIGGLYTUFF, + Species.PSYDUCK, + Species.GOLDUCK, + Species.MANKEY, + Species.PRIMEAPE, + Species.GROWLITHE, + Species.ARCANINE, + Species.POLIWHIRL, + Species.POLIWRATH, + Species.MACHOP, + Species.MACHOKE, + Species.MACHAMP, + Species.GEODUDE, + Species.GRAVELER, + Species.GOLEM, + Species.PONYTA, + Species.RAPIDASH, + Species.SLOWPOKE, + Species.SLOWBRO, + Species.SEEL, + Species.DEWGONG, + Species.GRIMER, + Species.MUK, + Species.GENGAR, + Species.ONIX, + Species.KRABBY, + Species.KINGLER, + Species.EXEGGCUTE, + Species.EXEGGUTOR, + Species.CUBONE, + Species.MAROWAK, + Species.HITMONLEE, + Species.HITMONCHAN, + Species.LICKITUNG, + Species.RHYHORN, + Species.RHYDON, + Species.CHANSEY, + Species.KANGASKHAN, + Species.ELECTABUZZ, + Species.MAGMAR, + Species.PINSIR, + Species.TAUROS, + Species.GYARADOS, + Species.LAPRAS, + Species.VAPOREON, + Species.JOLTEON, + Species.FLAREON, + Species.AERODACTYL, + Species.SNORLAX, + Species.DRAGONITE, + Species.MEWTWO, + Species.MEW, + Species.BAYLEEF, + Species.MEGANIUM, + Species.QUILAVA, + Species.TYPHLOSION, + Species.CROCONAW, + Species.FERALIGATR, + Species.FURRET, + Species.LEDIAN, + Species.FLAAFFY, + Species.AMPHAROS, + Species.MARILL, + Species.AZUMARILL, + Species.SUDOWOODO, + Species.POLITOED, + Species.AIPOM, + Species.QUAGSIRE, + Species.SLOWKING, + Species.GIRAFARIG, + Species.PINECO, + Species.FORRETRESS, + Species.DUNSPARCE, + Species.GLIGAR, + Species.STEELIX, + Species.SNUBBULL, + Species.GRANBULL, + Species.SCIZOR, + Species.SHUCKLE, + Species.HERACROSS, + Species.SNEASEL, + Species.TEDDIURSA, + Species.URSARING, + Species.MAGCARGO, + Species.SWINUB, + Species.PILOSWINE, + Species.CORSOLA, + Species.HOUNDOOM, + Species.PHANPY, + Species.DONPHAN, + Species.TYROGUE, + Species.HITMONTOP, + Species.MILTANK, + Species.BLISSEY, + Species.RAIKOU, + Species.ENTEI, + Species.TYRANITAR, + Species.LUGIA, + Species.HO_OH, + Species.TREECKO, + Species.GROVYLE, + Species.SCEPTILE, + Species.TORCHIC, + Species.COMBUSKEN, + Species.BLAZIKEN, + Species.MUDKIP, + Species.MARSHTOMP, + Species.SWAMPERT, + Species.MIGHTYENA, + Species.LINOONE, + Species.LOMBRE, + Species.LUDICOLO, + Species.NUZLEAF, + Species.SHIFTRY, + Species.BRELOOM, + Species.SLAKOTH, + Species.VIGOROTH, + Species.SLAKING, + Species.LOUDRED, + Species.EXPLOUD, + Species.MAKUHITA, + Species.HARIYAMA, + Species.NOSEPASS, + Species.DELCATTY, + Species.MAWILE, + Species.ARON, + Species.LAIRON, + Species.AGGRON, + Species.MEDITITE, + Species.MEDICHAM, + Species.ELECTRIKE, + Species.MANECTRIC, + Species.GULPIN, + Species.SWALOT, + Species.SHARPEDO, + Species.WAILMER, + Species.WAILORD, + Species.NUMEL, + Species.CAMERUPT, + Species.TORKOAL, + Species.SPINDA, + Species.TRAPINCH, + Species.VIBRAVA, + Species.FLYGON, + Species.CACTURNE, + Species.ZANGOOSE, + Species.SEVIPER, + Species.WHISCASH, + Species.CORPHISH, + Species.CRAWDAUNT, + Species.CLAYDOL, + Species.CRADILY, + Species.ARMALDO, + Species.KECLEON, + Species.DUSCLOPS, + Species.TROPIUS, + Species.ABSOL, + Species.SPHEAL, + Species.SEALEO, + Species.WALREIN, + Species.BAGON, + Species.SHELGON, + Species.SALAMENCE, + Species.METANG, + Species.METAGROSS, + Species.REGIROCK, + Species.REGICE, + Species.REGISTEEL, + Species.KYOGRE, + Species.GROUDON, + Species.RAYQUAZA, + Species.DEOXYS, + Species.TURTWIG, + Species.GROTLE, + Species.TORTERRA, + Species.CHIMCHAR, + Species.MONFERNO, + Species.INFERNAPE, + Species.PRINPLUP, + Species.EMPOLEON, + Species.BIBAREL, + Species.KRICKETUNE, + Species.SHINX, + Species.LUXIO, + Species.LUXRAY, + Species.CRANIDOS, + Species.RAMPARDOS, + Species.SHIELDON, + Species.BASTIODON, + Species.BUIZEL, + Species.FLOATZEL, + Species.GASTRODON, + Species.AMBIPOM, + Species.LOPUNNY, + Species.SKUNTANK, + Species.BRONZONG, + Species.GIBLE, + Species.GABITE, + Species.GARCHOMP, + Species.MUNCHLAX, + Species.RIOLU, + Species.LUCARIO, + Species.HIPPOPOTAS, + Species.HIPPOWDON, + Species.SKORUPI, + Species.DRAPION, + Species.CROAGUNK, + Species.TOXICROAK, + Species.ABOMASNOW, + Species.WEAVILE, + Species.LICKILICKY, + Species.RHYPERIOR, + Species.TANGROWTH, + Species.ELECTIVIRE, + Species.MAGMORTAR, + Species.LEAFEON, + Species.GLACEON, + Species.GLISCOR, + Species.MAMOSWINE, + Species.GALLADE, + Species.PROBOPASS, + Species.DUSKNOIR, + Species.DIALGA, + Species.PALKIA, + Species.HEATRAN, + Species.REGIGIGAS, + Species.GIRATINA, + Species.DARKRAI, + Species.ARCEUS, + Species.SERPERIOR, + Species.TEPIG, + Species.PIGNITE, + Species.EMBOAR, + Species.SAMUROTT, + Species.WATCHOG, + Species.HERDIER, + Species.STOUTLAND, + Species.ROGGENROLA, + Species.BOLDORE, + Species.GIGALITH, + Species.DRILBUR, + Species.EXCADRILL, + Species.TIMBURR, + Species.GURDURR, + Species.CONKELDURR, + Species.SEISMITOAD, + Species.THROH, + Species.SAWK, + Species.SCOLIPEDE, + Species.KROKOROK, + Species.KROOKODILE, + Species.DARUMAKA, + Species.DARMANITAN, + Species.DWEBBLE, + Species.CRUSTLE, + Species.SCRAGGY, + Species.SCRAFTY, + Species.TIRTOUGA, + Species.CARRACOSTA, + Species.REUNICLUS, + Species.FERROTHORN, + Species.EELEKTROSS, + Species.AXEW, + Species.FRAXURE, + Species.HAXORUS, + Species.CUBCHOO, + Species.BEARTIC, + Species.MIENFOO, + Species.MIENSHAO, + Species.DRUDDIGON, + Species.GOLETT, + Species.GOLURK, + Species.BOUFFALANT, + Species.RUFFLET, + Species.BRAVIARY, + Species.DURANT, + Species.DEINO, + Species.ZWEILOUS, + Species.HYDREIGON, + Species.COBALION, + Species.TERRAKION, + Species.VIRIZION, + Species.TORNADUS, + Species.THUNDURUS, + Species.RESHIRAM, + Species.ZEKROM, + Species.LANDORUS, + Species.KYUREM, + Species.KELDEO, + Species.MELOETTA, + Species.CHESPIN, + Species.QUILLADIN, + Species.CHESNAUGHT, + Species.FROAKIE, + Species.FROGADIER, + Species.GRENINJA, + Species.BUNNELBY, + Species.DIGGERSBY, + Species.LITLEO, + Species.PYROAR, + Species.SKIDDO, + Species.GOGOAT, + Species.PANCHAM, + Species.PANGORO, + Species.BINACLE, + Species.BARBARACLE, + Species.TYRUNT, + Species.TYRANTRUM, + Species.HAWLUCHA, + Species.GOODRA, + Species.PHANTUMP, + Species.TREVENANT, + Species.BERGMITE, + Species.AVALUGG, + Species.ZYGARDE, + Species.VOLCANION, + Species.MUDBRAY, + Species.MUDSDALE, + Species.STUFFUL, + Species.BEWEAR, + Species.GROOKEY, + Species.THWACKEY, + Species.RILLABOOM, + Species.OBSTAGOON, + Species.CUFANT, + Species.COPPERAJAH, + Species.URSALUNA, + Species.ANNIHILAPE, + Species.FARIGIRAF, + Species.DUDUNSPARCE, + Species.ALOLA_RATICATE, + Species.ALOLA_RAICHU, + Species.ALOLA_SANDSHREW, + Species.ALOLA_SANDSLASH, + Species.ALOLA_GEODUDE, + Species.ALOLA_GRAVELER, + Species.ALOLA_GOLEM, + Species.ALOLA_GRIMER, + Species.ALOLA_MUK, + Species.ALOLA_EXEGGUTOR, + Species.ALOLA_MAROWAK, + Species.GALAR_PONYTA, + Species.GALAR_RAPIDASH, + Species.GALAR_SLOWPOKE, + Species.GALAR_SLOWBRO, + Species.GALAR_SLOWKING, + Species.GALAR_LINOONE, + Species.GALAR_DARUMAKA, + Species.GALAR_DARMANITAN, + Species.HISUI_GROWLITHE, + Species.HISUI_ARCANINE, + Species.HISUI_TYPHLOSION, + Species.HISUI_SAMUROTT, + Species.HISUI_BRAVIARY, + Species.HISUI_AVALUGG, + Species.PALDEA_TAUROS, + Species.BLOODMOON_URSALUNA, + ], [Moves.SOLAR_BEAM]: [ Species.BULBASAUR, Species.IVYSAUR, @@ -13050,6 +13712,327 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_SANDSHREW, Species.ALOLA_SANDSLASH, ], + [Moves.FLASH]: [ + Species.BULBASAUR, + Species.IVYSAUR, + Species.VENUSAUR, + Species.BUTTERFREE, + Species.BEEDRILL, + Species.PIKACHU, + Species.RAICHU, + Species.CLEFAIRY, + Species.CLEFABLE, + Species.JIGGLYPUFF, + Species.WIGGLYTUFF, + Species.ODDISH, + Species.GLOOM, + Species.VILEPLUME, + Species.PARAS, + Species.PARASECT, + Species.VENONAT, + Species.VENOMOTH, + Species.MEOWTH, + Species.PERSIAN, + Species.PSYDUCK, + Species.GOLDUCK, + Species.ABRA, + Species.KADABRA, + Species.ALAKAZAM, + Species.BELLSPROUT, + Species.WEEPINBELL, + Species.VICTREEBEL, + Species.SLOWPOKE, + Species.SLOWBRO, + Species.MAGNEMITE, + Species.MAGNETON, + Species.DROWZEE, + Species.HYPNO, + Species.VOLTORB, + Species.ELECTRODE, + Species.EXEGGCUTE, + Species.EXEGGUTOR, + Species.KOFFING, + Species.WEEZING, + Species.CHANSEY, + Species.TANGELA, + Species.STARYU, + Species.STARMIE, + Species.MR_MIME, + Species.JYNX, + Species.ELECTABUZZ, + Species.JOLTEON, + Species.PORYGON, + Species.ZAPDOS, + Species.MEWTWO, + Species.MEW, + Species.CHIKORITA, + Species.BAYLEEF, + Species.MEGANIUM, + Species.HOOTHOOT, + Species.NOCTOWL, + Species.LEDYBA, + Species.LEDIAN, + Species.SPINARAK, + Species.ARIADOS, + Species.CHINCHOU, + Species.LANTURN, + Species.PICHU, + Species.CLEFFA, + Species.IGGLYBUFF, + Species.TOGEPI, + Species.TOGETIC, + Species.NATU, + Species.XATU, + Species.MAREEP, + Species.FLAAFFY, + Species.AMPHAROS, + Species.BELLOSSOM, + Species.HOPPIP, + Species.SKIPLOOM, + Species.JUMPLUFF, + Species.SUNKERN, + Species.SUNFLORA, + Species.YANMA, + Species.WOOPER, + Species.QUAGSIRE, + Species.ESPEON, + Species.UMBREON, + Species.SLOWKING, + Species.MISDREAVUS, + Species.GIRAFARIG, + Species.SHUCKLE, + Species.SKARMORY, + Species.PORYGON2, + Species.STANTLER, + Species.SMOOCHUM, + Species.ELEKID, + Species.BLISSEY, + Species.RAIKOU, + Species.ENTEI, + Species.LUGIA, + Species.HO_OH, + Species.CELEBI, + Species.TREECKO, + Species.GROVYLE, + Species.SCEPTILE, + Species.BEAUTIFLY, + Species.DUSTOX, + Species.LOTAD, + Species.LOMBRE, + Species.LUDICOLO, + Species.SEEDOT, + Species.NUZLEAF, + Species.SHIFTRY, + Species.RALTS, + Species.KIRLIA, + Species.GARDEVOIR, + Species.SURSKIT, + Species.MASQUERAIN, + Species.SHROOMISH, + Species.BRELOOM, + Species.NINCADA, + Species.NINJASK, + Species.SHEDINJA, + Species.SKITTY, + Species.DELCATTY, + Species.SABLEYE, + Species.MEDITITE, + Species.MEDICHAM, + Species.ELECTRIKE, + Species.MANECTRIC, + Species.PLUSLE, + Species.MINUN, + Species.VOLBEAT, + Species.ILLUMISE, + Species.ROSELIA, + Species.SPOINK, + Species.GRUMPIG, + Species.SPINDA, + Species.CACNEA, + Species.CACTURNE, + Species.LUNATONE, + Species.SOLROCK, + Species.BALTOY, + Species.CLAYDOL, + Species.LILEEP, + Species.CRADILY, + Species.CASTFORM, + Species.KECLEON, + Species.SHUPPET, + Species.BANETTE, + Species.DUSKULL, + Species.DUSCLOPS, + Species.TROPIUS, + Species.CHIMECHO, + Species.ABSOL, + Species.SNORUNT, + Species.GLALIE, + Species.METANG, + Species.METAGROSS, + Species.LATIAS, + Species.LATIOS, + Species.JIRACHI, + Species.DEOXYS, + Species.TURTWIG, + Species.GROTLE, + Species.TORTERRA, + Species.KRICKETUNE, + Species.SHINX, + Species.LUXIO, + Species.LUXRAY, + Species.BUDEW, + Species.ROSERADE, + Species.WORMADAM, + Species.MOTHIM, + Species.VESPIQUEN, + Species.PACHIRISU, + Species.CHERUBI, + Species.CHERRIM, + Species.GASTRODON, + Species.DRIFLOON, + Species.DRIFBLIM, + Species.MISMAGIUS, + Species.GLAMEOW, + Species.PURUGLY, + Species.CHINGLING, + Species.BRONZOR, + Species.BRONZONG, + Species.MIME_JR, + Species.HAPPINY, + Species.SPIRITOMB, + Species.SKORUPI, + Species.DRAPION, + Species.CARNIVINE, + Species.FINNEON, + Species.LUMINEON, + Species.SNOVER, + Species.ABOMASNOW, + Species.MAGNEZONE, + Species.TANGROWTH, + Species.ELECTIVIRE, + Species.TOGEKISS, + Species.YANMEGA, + Species.LEAFEON, + Species.PORYGON_Z, + Species.GALLADE, + Species.DUSKNOIR, + Species.FROSLASS, + Species.ROTOM, + Species.UXIE, + Species.MESPRIT, + Species.AZELF, + Species.DIALGA, + Species.CRESSELIA, + Species.MANAPHY, + Species.DARKRAI, + Species.SHAYMIN, + Species.ARCEUS, + Species.VICTINI, + Species.SNIVY, + Species.SERVINE, + Species.SERPERIOR, + Species.WATCHOG, + Species.PANSAGE, + Species.SIMISAGE, + Species.MUNNA, + Species.MUSHARNA, + Species.BLITZLE, + Species.ZEBSTRIKA, + Species.WOOBAT, + Species.SWOOBAT, + Species.AUDINO, + Species.SEWADDLE, + Species.SWADLOON, + Species.LEAVANNY, + Species.COTTONEE, + Species.WHIMSICOTT, + Species.PETILIL, + Species.LILLIGANT, + Species.SIGILYPH, + Species.YAMASK, + Species.COFAGRIGUS, + Species.GOTHITA, + Species.GOTHORITA, + Species.GOTHITELLE, + Species.SOLOSIS, + Species.DUOSION, + Species.REUNICLUS, + Species.DEERLING, + Species.SAWSBUCK, + Species.EMOLGA, + Species.FOONGUS, + Species.AMOONGUSS, + Species.FRILLISH, + Species.JELLICENT, + Species.JOLTIK, + Species.GALVANTULA, + Species.FERROSEED, + Species.FERROTHORN, + Species.EELEKTRIK, + Species.EELEKTROSS, + Species.ELGYEM, + Species.BEHEEYEM, + Species.LITWICK, + Species.LAMPENT, + Species.CHANDELURE, + Species.STUNFISK, + Species.GOLETT, + Species.GOLURK, + Species.VIRIZION, + Species.ZEKROM, + Species.MELOETTA, + Species.GENESECT, + Species.CHESPIN, + Species.QUILLADIN, + Species.CHESNAUGHT, + Species.VIVILLON, + Species.FLABEBE, + Species.FLOETTE, + Species.FLORGES, + Species.FURFROU, + Species.ESPURR, + Species.MEOWSTIC, + Species.SPRITZEE, + Species.AROMATISSE, + Species.SWIRLIX, + Species.SLURPUFF, + Species.INKAY, + Species.MALAMAR, + Species.HELIOPTILE, + Species.HELIOLISK, + Species.AMAURA, + Species.AURORUS, + Species.SYLVEON, + Species.DEDENNE, + Species.CARBINK, + Species.PUMPKABOO, + Species.GOURGEIST, + Species.BERGMITE, + Species.AVALUGG, + Species.XERNEAS, + Species.DIANCIE, + Species.HOOPA, + Species.MORELULL, + Species.SHIINOTIC, + Species.PERRSERKER, + Species.MR_RIME, + Species.RUNERIGUS, + Species.WYRDEER, + Species.CLODSIRE, + Species.FARIGIRAF, + Species.ALOLA_RAICHU, + Species.ALOLA_MEOWTH, + Species.ALOLA_PERSIAN, + Species.ALOLA_EXEGGUTOR, + Species.ETERNAL_FLOETTE, + Species.GALAR_MEOWTH, + Species.GALAR_WEEZING, + Species.GALAR_MR_MIME, + Species.GALAR_YAMASK, + Species.HISUI_LILLIGANT, + Species.HISUI_AVALUGG, + Species.PALDEA_WOOPER, + ], [Moves.EXPLOSION]: [ Species.GEODUDE, Species.GRAVELER, @@ -31599,6 +32582,476 @@ export const tmSpecies: TmSpecies = { Species.GALAR_ARTICUNO, Species.GALAR_SLOWKING, ], + [Moves.ROCK_SMASH]: [ + Species.BULBASAUR, + Species.IVYSAUR, + Species.VENUSAUR, + Species.CHARMANDER, + Species.CHARMELEON, + Species.CHARIZARD, + Species.SQUIRTLE, + Species.WARTORTLE, + Species.BLASTOISE, + Species.BEEDRILL, + Species.RATTATA, + Species.RATICATE, + Species.PIKACHU, + Species.RAICHU, + Species.SANDSHREW, + Species.SANDSLASH, + Species.NIDORAN_F, + Species.NIDORINA, + Species.NIDOQUEEN, + Species.NIDORAN_M, + Species.NIDORINO, + Species.NIDOKING, + Species.CLEFAIRY, + Species.CLEFABLE, + Species.PARAS, + Species.PARASECT, + Species.DIGLETT, + Species.DUGTRIO, + Species.PSYDUCK, + Species.GOLDUCK, + Species.MANKEY, + Species.PRIMEAPE, + Species.GROWLITHE, + Species.ARCANINE, + Species.POLIWHIRL, + Species.POLIWRATH, + Species.MACHOP, + Species.MACHOKE, + Species.MACHAMP, + Species.GEODUDE, + Species.GRAVELER, + Species.GOLEM, + Species.SLOWBRO, + Species.MUK, + Species.GENGAR, + Species.ONIX, + Species.KRABBY, + Species.KINGLER, + Species.CUBONE, + Species.MAROWAK, + Species.HITMONLEE, + Species.HITMONCHAN, + Species.LICKITUNG, + Species.RHYHORN, + Species.RHYDON, + Species.CHANSEY, + Species.TANGELA, + Species.KANGASKHAN, + Species.SCYTHER, + Species.ELECTABUZZ, + Species.MAGMAR, + Species.PINSIR, + Species.TAUROS, + Species.GYARADOS, + Species.LAPRAS, + Species.VAPOREON, + Species.JOLTEON, + Species.FLAREON, + Species.OMANYTE, + Species.OMASTAR, + Species.KABUTO, + Species.KABUTOPS, + Species.AERODACTYL, + Species.SNORLAX, + Species.ARTICUNO, + Species.ZAPDOS, + Species.MOLTRES, + Species.DRAGONITE, + Species.MEWTWO, + Species.MEW, + Species.BAYLEEF, + Species.MEGANIUM, + Species.QUILAVA, + Species.TYPHLOSION, + Species.CROCONAW, + Species.FERALIGATR, + Species.FURRET, + Species.LEDIAN, + Species.TOGEPI, + Species.TOGETIC, + Species.FLAAFFY, + Species.AMPHAROS, + Species.MARILL, + Species.AZUMARILL, + Species.SUDOWOODO, + Species.POLITOED, + Species.AIPOM, + Species.WOOPER, + Species.QUAGSIRE, + Species.ESPEON, + Species.UMBREON, + Species.SLOWKING, + Species.GIRAFARIG, + Species.PINECO, + Species.FORRETRESS, + Species.DUNSPARCE, + Species.GLIGAR, + Species.STEELIX, + Species.SNUBBULL, + Species.GRANBULL, + Species.SCIZOR, + Species.SHUCKLE, + Species.HERACROSS, + Species.SNEASEL, + Species.TEDDIURSA, + Species.URSARING, + Species.SLUGMA, + Species.MAGCARGO, + Species.SWINUB, + Species.PILOSWINE, + Species.CORSOLA, + Species.SKARMORY, + Species.HOUNDOUR, + Species.HOUNDOOM, + Species.PHANPY, + Species.DONPHAN, + Species.TYROGUE, + Species.HITMONTOP, + Species.ELEKID, + Species.MAGBY, + Species.MILTANK, + Species.BLISSEY, + Species.RAIKOU, + Species.ENTEI, + Species.SUICUNE, + Species.LARVITAR, + Species.PUPITAR, + Species.TYRANITAR, + Species.LUGIA, + Species.HO_OH, + Species.TREECKO, + Species.GROVYLE, + Species.SCEPTILE, + Species.TORCHIC, + Species.COMBUSKEN, + Species.BLAZIKEN, + Species.MUDKIP, + Species.MARSHTOMP, + Species.SWAMPERT, + Species.POOCHYENA, + Species.MIGHTYENA, + Species.ZIGZAGOON, + Species.LINOONE, + Species.LOMBRE, + Species.LUDICOLO, + Species.SEEDOT, + Species.NUZLEAF, + Species.SHIFTRY, + Species.BRELOOM, + Species.SLAKOTH, + Species.VIGOROTH, + Species.SLAKING, + Species.LOUDRED, + Species.EXPLOUD, + Species.MAKUHITA, + Species.HARIYAMA, + Species.NOSEPASS, + Species.DELCATTY, + Species.SABLEYE, + Species.MAWILE, + Species.ARON, + Species.LAIRON, + Species.AGGRON, + Species.MEDITITE, + Species.MEDICHAM, + Species.GULPIN, + Species.SWALOT, + Species.SHARPEDO, + Species.WAILMER, + Species.WAILORD, + Species.NUMEL, + Species.CAMERUPT, + Species.TORKOAL, + Species.SPINDA, + Species.TRAPINCH, + Species.VIBRAVA, + Species.FLYGON, + Species.ALTARIA, + Species.ZANGOOSE, + Species.SEVIPER, + Species.BARBOACH, + Species.WHISCASH, + Species.CORPHISH, + Species.CRAWDAUNT, + Species.CLAYDOL, + Species.CRADILY, + Species.ANORITH, + Species.ARMALDO, + Species.KECLEON, + Species.DUSCLOPS, + Species.TROPIUS, + Species.ABSOL, + Species.SPHEAL, + Species.SEALEO, + Species.WALREIN, + Species.RELICANTH, + Species.BAGON, + Species.SHELGON, + Species.SALAMENCE, + Species.METANG, + Species.METAGROSS, + Species.REGIROCK, + Species.REGICE, + Species.REGISTEEL, + Species.KYOGRE, + Species.GROUDON, + Species.RAYQUAZA, + Species.DEOXYS, + Species.TURTWIG, + Species.GROTLE, + Species.TORTERRA, + Species.CHIMCHAR, + Species.MONFERNO, + Species.INFERNAPE, + Species.PIPLUP, + Species.PRINPLUP, + Species.EMPOLEON, + Species.BIDOOF, + Species.BIBAREL, + Species.KRICKETUNE, + Species.CRANIDOS, + Species.RAMPARDOS, + Species.SHIELDON, + Species.BASTIODON, + Species.BUIZEL, + Species.FLOATZEL, + Species.GASTRODON, + Species.AMBIPOM, + Species.BUNEARY, + Species.LOPUNNY, + Species.STUNKY, + Species.SKUNTANK, + Species.BRONZONG, + Species.GIBLE, + Species.GABITE, + Species.GARCHOMP, + Species.MUNCHLAX, + Species.RIOLU, + Species.LUCARIO, + Species.HIPPOPOTAS, + Species.HIPPOWDON, + Species.SKORUPI, + Species.DRAPION, + Species.CROAGUNK, + Species.TOXICROAK, + Species.ABOMASNOW, + Species.WEAVILE, + Species.LICKILICKY, + Species.RHYPERIOR, + Species.TANGROWTH, + Species.ELECTIVIRE, + Species.MAGMORTAR, + Species.TOGEKISS, + Species.LEAFEON, + Species.GLACEON, + Species.GLISCOR, + Species.MAMOSWINE, + Species.GALLADE, + Species.PROBOPASS, + Species.DUSKNOIR, + Species.DIALGA, + Species.PALKIA, + Species.HEATRAN, + Species.REGIGIGAS, + Species.GIRATINA, + Species.DARKRAI, + Species.ARCEUS, + Species.VICTINI, + Species.SERPERIOR, + Species.TEPIG, + Species.PIGNITE, + Species.EMBOAR, + Species.OSHAWOTT, + Species.DEWOTT, + Species.SAMUROTT, + Species.WATCHOG, + Species.LILLIPUP, + Species.HERDIER, + Species.STOUTLAND, + Species.LIEPARD, + Species.PANSAGE, + Species.SIMISAGE, + Species.PANSEAR, + Species.SIMISEAR, + Species.PANPOUR, + Species.SIMIPOUR, + Species.ZEBSTRIKA, + Species.ROGGENROLA, + Species.BOLDORE, + Species.GIGALITH, + Species.DRILBUR, + Species.EXCADRILL, + Species.TIMBURR, + Species.GURDURR, + Species.CONKELDURR, + Species.PALPITOAD, + Species.SEISMITOAD, + Species.THROH, + Species.SAWK, + Species.VENIPEDE, + Species.WHIRLIPEDE, + Species.SCOLIPEDE, + Species.KROKOROK, + Species.KROOKODILE, + Species.DARUMAKA, + Species.DARMANITAN, + Species.DWEBBLE, + Species.CRUSTLE, + Species.SCRAGGY, + Species.SCRAFTY, + Species.TIRTOUGA, + Species.CARRACOSTA, + Species.ARCHEN, + Species.ARCHEOPS, + Species.ZOROARK, + Species.REUNICLUS, + Species.SAWSBUCK, + Species.ESCAVALIER, + Species.FERROSEED, + Species.FERROTHORN, + Species.KLINK, + Species.KLANG, + Species.KLINKLANG, + Species.EELEKTROSS, + Species.AXEW, + Species.FRAXURE, + Species.HAXORUS, + Species.CUBCHOO, + Species.BEARTIC, + Species.MIENFOO, + Species.MIENSHAO, + Species.DRUDDIGON, + Species.GOLETT, + Species.GOLURK, + Species.PAWNIARD, + Species.BISHARP, + Species.BOUFFALANT, + Species.RUFFLET, + Species.BRAVIARY, + Species.VULLABY, + Species.MANDIBUZZ, + Species.HEATMOR, + Species.DURANT, + Species.DEINO, + Species.ZWEILOUS, + Species.HYDREIGON, + Species.COBALION, + Species.TERRAKION, + Species.VIRIZION, + Species.TORNADUS, + Species.THUNDURUS, + Species.RESHIRAM, + Species.ZEKROM, + Species.LANDORUS, + Species.KYUREM, + Species.KELDEO, + Species.MELOETTA, + Species.CHESPIN, + Species.QUILLADIN, + Species.CHESNAUGHT, + Species.FROAKIE, + Species.FROGADIER, + Species.GRENINJA, + Species.BUNNELBY, + Species.DIGGERSBY, + Species.LITLEO, + Species.PYROAR, + Species.SKIDDO, + Species.GOGOAT, + Species.PANCHAM, + Species.PANGORO, + Species.FURFROU, + Species.HONEDGE, + Species.DOUBLADE, + Species.AEGISLASH, + Species.BINACLE, + Species.BARBARACLE, + Species.TYRUNT, + Species.TYRANTRUM, + Species.AMAURA, + Species.AURORUS, + Species.SYLVEON, + Species.HAWLUCHA, + Species.GOODRA, + Species.PHANTUMP, + Species.TREVENANT, + Species.PUMPKABOO, + Species.GOURGEIST, + Species.BERGMITE, + Species.AVALUGG, + Species.ZYGARDE, + Species.VOLCANION, + Species.PIKIPEK, + Species.TRUMBEAK, + Species.TOUCANNON, + Species.CRABRAWLER, + Species.CRABOMINABLE, + Species.MUDBRAY, + Species.MUDSDALE, + Species.PASSIMIAN, + Species.GOLISOPOD, + Species.TAPU_BULU, + Species.ROOKIDEE, + Species.CORVISQUIRE, + Species.CORVIKNIGHT, + Species.CLOBBOPUS, + Species.GRAPPLOCT, + Species.OBSTAGOON, + Species.SIRFETCHD, + Species.FALINKS, + Species.CUFANT, + Species.COPPERAJAH, + Species.DURALUDON, + Species.KUBFU, + Species.URSHIFU, + Species.KLEAVOR, + Species.URSALUNA, + Species.SNEASLER, + Species.ENAMORUS, + Species.KLAWF, + Species.TINKATINK, + Species.TINKATUFF, + Species.TINKATON, + Species.ANNIHILAPE, + Species.CLODSIRE, + Species.FARIGIRAF, + Species.DUDUNSPARCE, + Species.KINGAMBIT, + Species.KORAIDON, + Species.ARCHALUDON, + Species.ALOLA_RATTATA, + Species.ALOLA_RATICATE, + Species.ALOLA_RAICHU, + Species.ALOLA_SANDSHREW, + Species.ALOLA_SANDSLASH, + Species.ALOLA_DIGLETT, + Species.ALOLA_DUGTRIO, + Species.ALOLA_MAROWAK, + Species.GALAR_FARFETCHD, + Species.GALAR_ZAPDOS, + Species.GALAR_ZIGZAGOON, + Species.GALAR_LINOONE, + Species.GALAR_DARUMAKA, + Species.GALAR_DARMANITAN, + Species.HISUI_GROWLITHE, + Species.HISUI_ARCANINE, + Species.HISUI_TYPHLOSION, + Species.HISUI_SNEASEL, + Species.HISUI_SAMUROTT, + Species.HISUI_LILLIGANT, + Species.HISUI_ZOROARK, + Species.HISUI_BRAVIARY, + Species.HISUI_GOODRA, + Species.HISUI_AVALUGG, + Species.HISUI_DECIDUEYE, + Species.PALDEA_TAUROS, + Species.PALDEA_WOOPER, + Species.BLOODMOON_URSALUNA, + ], [Moves.WHIRLPOOL]: [ Species.SQUIRTLE, Species.WARTORTLE, @@ -48034,6 +49487,296 @@ export const tmSpecies: TmSpecies = { Species.HISUI_SLIGGOO, Species.HISUI_GOODRA, ], + [Moves.ROCK_CLIMB]: [ + Species.VENUSAUR, + Species.BLASTOISE, + Species.SANDSHREW, + Species.SANDSLASH, + Species.NIDOQUEEN, + Species.NIDOKING, + Species.GOLDUCK, + Species.MANKEY, + Species.PRIMEAPE, + Species.ARCANINE, + Species.POLIWRATH, + Species.MACHOP, + Species.MACHOKE, + Species.MACHAMP, + Species.GEODUDE, + Species.GRAVELER, + Species.GOLEM, + Species.ONIX, + Species.CUBONE, + Species.MAROWAK, + Species.HITMONLEE, + Species.HITMONCHAN, + Species.LICKITUNG, + Species.RHYHORN, + Species.RHYDON, + Species.CHANSEY, + Species.KANGASKHAN, + Species.ELECTABUZZ, + Species.MAGMAR, + Species.PINSIR, + Species.TAUROS, + Species.OMASTAR, + Species.KABUTOPS, + Species.SNORLAX, + Species.MEWTWO, + Species.MEW, + Species.MEGANIUM, + Species.TYPHLOSION, + Species.FERALIGATR, + Species.AMPHAROS, + Species.GLIGAR, + Species.STEELIX, + Species.GRANBULL, + Species.URSARING, + Species.BLISSEY, + Species.RAIKOU, + Species.ENTEI, + Species.SUICUNE, + Species.TYRANITAR, + Species.SCEPTILE, + Species.BLAZIKEN, + Species.SWAMPERT, + Species.ZIGZAGOON, + Species.LINOONE, + Species.LUDICOLO, + Species.VIGOROTH, + Species.SLAKING, + Species.EXPLOUD, + Species.MAKUHITA, + Species.HARIYAMA, + Species.AGGRON, + Species.ZANGOOSE, + Species.REGIROCK, + Species.REGICE, + Species.REGISTEEL, + Species.GROUDON, + Species.TURTWIG, + Species.GROTLE, + Species.TORTERRA, + Species.CHIMCHAR, + Species.MONFERNO, + Species.INFERNAPE, + Species.EMPOLEON, + Species.BIDOOF, + Species.BIBAREL, + Species.CRANIDOS, + Species.RAMPARDOS, + Species.GIBLE, + Species.GABITE, + Species.GARCHOMP, + Species.MUNCHLAX, + Species.LUCARIO, + Species.DRAPION, + Species.CROAGUNK, + Species.TOXICROAK, + Species.ABOMASNOW, + Species.LICKILICKY, + Species.RHYPERIOR, + Species.ELECTIVIRE, + Species.MAGMORTAR, + Species.GLISCOR, + Species.MAMOSWINE, + Species.HEATRAN, + Species.REGIGIGAS, + Species.GIRATINA, + Species.DARKRAI, + Species.ARCEUS, + Species.DRILBUR, + Species.EXCADRILL, + Species.VENIPEDE, + Species.WHIRLIPEDE, + Species.SCOLIPEDE, + Species.SANDILE, + Species.KROKOROK, + Species.KROOKODILE, + Species.SCRAGGY, + Species.SCRAFTY, + Species.JOLTIK, + Species.GALVANTULA, + Species.FERROSEED, + Species.FERROTHORN, + Species.DRUDDIGON, + Species.BOUFFALANT, + Species.DURANT, + Species.ROCKRUFF, + Species.LYCANROC, + Species.OBSTAGOON, + Species.URSALUNA, + Species.ANNIHILAPE, + Species.ALOLA_GEODUDE, + Species.ALOLA_GRAVELER, + Species.ALOLA_GOLEM, + Species.ALOLA_MAROWAK, + Species.GALAR_ZIGZAGOON, + Species.GALAR_LINOONE, + Species.HISUI_ARCANINE, + Species.HISUI_TYPHLOSION, + Species.PALDEA_TAUROS, + Species.BLOODMOON_URSALUNA, + ], + [Moves.DEFOG]: [ + Species.CHARIZARD, + Species.BUTTERFREE, + Species.BEEDRILL, + Species.PIDGEY, + Species.PIDGEOTTO, + Species.PIDGEOT, + Species.SPEAROW, + Species.FEAROW, + Species.ZUBAT, + Species.GOLBAT, + Species.VENOMOTH, + Species.FARFETCHD, + Species.SCYTHER, + Species.AERODACTYL, + Species.ARTICUNO, + Species.ZAPDOS, + Species.MOLTRES, + Species.DRAGONITE, + Species.MEW, + Species.HOOTHOOT, + Species.NOCTOWL, + Species.LEDIAN, + Species.CROBAT, + Species.TOGETIC, + Species.XATU, + Species.YANMA, + Species.MURKROW, + Species.GLIGAR, + Species.SCIZOR, + Species.DELIBIRD, + Species.MANTINE, + Species.SKARMORY, + Species.LUGIA, + Species.HO_OH, + Species.TORCHIC, + Species.COMBUSKEN, + Species.BLAZIKEN, + Species.BEAUTIFLY, + Species.DUSTOX, + Species.SEEDOT, + Species.NUZLEAF, + Species.SHIFTRY, + Species.TAILLOW, + Species.SWELLOW, + Species.WINGULL, + Species.PELIPPER, + Species.MASQUERAIN, + Species.NINJASK, + Species.VOLBEAT, + Species.ILLUMISE, + Species.VIBRAVA, + Species.FLYGON, + Species.SWABLU, + Species.ALTARIA, + Species.CASTFORM, + Species.TROPIUS, + Species.CHIMECHO, + Species.SALAMENCE, + Species.LATIAS, + Species.LATIOS, + Species.RAYQUAZA, + Species.PIPLUP, + Species.PRINPLUP, + Species.EMPOLEON, + Species.STARLY, + Species.STARAVIA, + Species.STARAPTOR, + Species.MOTHIM, + Species.VESPIQUEN, + Species.DRIFLOON, + Species.DRIFBLIM, + Species.HONCHKROW, + Species.STUNKY, + Species.SKUNTANK, + Species.CHATOT, + Species.CARNIVINE, + Species.FINNEON, + Species.LUMINEON, + Species.TOGEKISS, + Species.YANMEGA, + Species.GLISCOR, + Species.ROTOM, + Species.GIRATINA, + Species.ARCEUS, + Species.SNIVY, + Species.SERVINE, + Species.SERPERIOR, + Species.PIDOVE, + Species.TRANQUILL, + Species.UNFEZANT, + Species.WOOBAT, + Species.SWOOBAT, + Species.TIMBURR, + Species.GURDURR, + Species.CONKELDURR, + Species.COTTONEE, + Species.WHIMSICOTT, + Species.SIGILYPH, + Species.ARCHEN, + Species.ARCHEOPS, + Species.DUCKLETT, + Species.SWANNA, + Species.EMOLGA, + Species.CRYOGONAL, + Species.RUFFLET, + Species.BRAVIARY, + Species.VULLABY, + Species.MANDIBUZZ, + Species.HYDREIGON, + Species.VOLCARONA, + Species.TORNADUS, + Species.THUNDURUS, + Species.RESHIRAM, + Species.ZEKROM, + Species.LANDORUS, + Species.FLETCHLING, + Species.FLETCHINDER, + Species.TALONFLAME, + Species.VIVILLON, + Species.FLORGES, + Species.HAWLUCHA, + Species.KLEFKI, + Species.NOIBAT, + Species.NOIVERN, + Species.XERNEAS, + Species.YVELTAL, + Species.VOLCANION, + Species.ROWLET, + Species.DARTRIX, + Species.DECIDUEYE, + Species.PIKIPEK, + Species.TRUMBEAK, + Species.TOUCANNON, + Species.ORICORIO, + Species.CUTIEFLY, + Species.RIBOMBEE, + Species.FOMANTIS, + Species.LURANTIS, + Species.COMFEY, + Species.SILVALLY, + Species.DRAMPA, + Species.TAPU_KOKO, + Species.TAPU_FINI, + Species.LUNALA, + Species.KARTANA, + Species.ROOKIDEE, + Species.CORVISQUIRE, + Species.CORVIKNIGHT, + Species.CRAMORANT, + Species.SIRFETCHD, + Species.FROSMOTH, + Species.KLEAVOR, + Species.GALAR_FARFETCHD, + Species.GALAR_WEEZING, + Species.HISUI_LILLIGANT, + Species.HISUI_BRAVIARY, + Species.HISUI_DECIDUEYE, + ], [Moves.TRICK_ROOM]: [ Species.ABRA, Species.KADABRA, @@ -62023,6 +63766,7 @@ export const tmPoolTiers: TmPoolTiers = { [Moves.ICE_PUNCH]: ModifierTier.GREAT, [Moves.THUNDER_PUNCH]: ModifierTier.GREAT, [Moves.SWORDS_DANCE]: ModifierTier.COMMON, + [Moves.CUT]: ModifierTier.COMMON, [Moves.FLY]: ModifierTier.COMMON, [Moves.MEGA_KICK]: ModifierTier.GREAT, [Moves.BODY_SLAM]: ModifierTier.GREAT, @@ -62038,6 +63782,7 @@ export const tmPoolTiers: TmPoolTiers = { [Moves.PSYBEAM]: ModifierTier.GREAT, [Moves.HYPER_BEAM]: ModifierTier.ULTRA, [Moves.LOW_KICK]: ModifierTier.COMMON, + [Moves.STRENGTH]: ModifierTier.GREAT, [Moves.SOLAR_BEAM]: ModifierTier.ULTRA, [Moves.FIRE_SPIN]: ModifierTier.COMMON, [Moves.THUNDERBOLT]: ModifierTier.ULTRA, @@ -62064,6 +63809,7 @@ export const tmPoolTiers: TmPoolTiers = { [Moves.AMNESIA]: ModifierTier.COMMON, [Moves.DREAM_EATER]: ModifierTier.GREAT, [Moves.LEECH_LIFE]: ModifierTier.ULTRA, + [Moves.FLASH]: ModifierTier.COMMON, [Moves.EXPLOSION]: ModifierTier.GREAT, [Moves.REST]: ModifierTier.COMMON, [Moves.ROCK_SLIDE]: ModifierTier.GREAT, @@ -62107,6 +63853,7 @@ export const tmPoolTiers: TmPoolTiers = { [Moves.PSYCH_UP]: ModifierTier.COMMON, [Moves.SHADOW_BALL]: ModifierTier.ULTRA, [Moves.FUTURE_SIGHT]: ModifierTier.GREAT, + [Moves.ROCK_SMASH]: ModifierTier.COMMON, [Moves.WHIRLPOOL]: ModifierTier.COMMON, [Moves.BEAT_UP]: ModifierTier.COMMON, [Moves.UPROAR]: ModifierTier.GREAT, @@ -62201,6 +63948,8 @@ export const tmPoolTiers: TmPoolTiers = { [Moves.PSYCHO_CUT]: ModifierTier.GREAT, [Moves.ZEN_HEADBUTT]: ModifierTier.GREAT, [Moves.FLASH_CANNON]: ModifierTier.GREAT, + [Moves.ROCK_CLIMB]: ModifierTier.GREAT, + [Moves.DEFOG]: ModifierTier.COMMON, [Moves.TRICK_ROOM]: ModifierTier.COMMON, [Moves.DRACO_METEOR]: ModifierTier.ULTRA, [Moves.LEAF_STORM]: ModifierTier.ULTRA,