diff --git a/public/images/pokemon/icons/variant/1/123_1.png b/public/images/pokemon/icons/variant/1/123_1.png new file mode 100644 index 000000000..0bc5a3f68 Binary files /dev/null and b/public/images/pokemon/icons/variant/1/123_1.png differ diff --git a/public/images/pokemon/icons/variant/1/123_2.png b/public/images/pokemon/icons/variant/1/123_2.png new file mode 100644 index 000000000..08df4b1b3 Binary files /dev/null and b/public/images/pokemon/icons/variant/1/123_2.png differ diff --git a/public/images/pokemon/icons/variant/1/123_3.png b/public/images/pokemon/icons/variant/1/123_3.png new file mode 100644 index 000000000..95533340f Binary files /dev/null and b/public/images/pokemon/icons/variant/1/123_3.png differ diff --git a/public/images/pokemon/icons/variant/1/150_2.png b/public/images/pokemon/icons/variant/1/150_2.png new file mode 100644 index 000000000..f2fbe8198 Binary files /dev/null and b/public/images/pokemon/icons/variant/1/150_2.png differ diff --git a/public/images/pokemon/icons/variant/1/150_3.png b/public/images/pokemon/icons/variant/1/150_3.png new file mode 100644 index 000000000..47742c993 Binary files /dev/null and b/public/images/pokemon/icons/variant/1/150_3.png differ diff --git a/public/images/pokemon/icons/variant/1/35_3.png b/public/images/pokemon/icons/variant/1/35_3.png new file mode 100644 index 000000000..e6f4fb4f5 Binary files /dev/null and b/public/images/pokemon/icons/variant/1/35_3.png differ diff --git a/public/images/pokemon/icons/variant/1/36_3.png b/public/images/pokemon/icons/variant/1/36_3.png new file mode 100644 index 000000000..159deb7ac Binary files /dev/null and b/public/images/pokemon/icons/variant/1/36_3.png differ diff --git a/public/images/pokemon/icons/variant/1/69_2.png b/public/images/pokemon/icons/variant/1/69_2.png new file mode 100644 index 000000000..6924dccf9 Binary files /dev/null and b/public/images/pokemon/icons/variant/1/69_2.png differ diff --git a/public/images/pokemon/icons/variant/1/70_2.png b/public/images/pokemon/icons/variant/1/70_2.png new file mode 100644 index 000000000..6095f7032 Binary files /dev/null and b/public/images/pokemon/icons/variant/1/70_2.png differ diff --git a/public/images/pokemon/icons/variant/1/71_2.png b/public/images/pokemon/icons/variant/1/71_2.png new file mode 100644 index 000000000..4cac71faa Binary files /dev/null and b/public/images/pokemon/icons/variant/1/71_2.png differ diff --git a/public/images/pokemon/icons/variant/2/212-mega_1.png b/public/images/pokemon/icons/variant/2/212-mega_1.png new file mode 100644 index 000000000..53bc17210 Binary files /dev/null and b/public/images/pokemon/icons/variant/2/212-mega_1.png differ diff --git a/public/images/pokemon/icons/variant/2/212-mega_2.png b/public/images/pokemon/icons/variant/2/212-mega_2.png new file mode 100644 index 000000000..b541274ce Binary files /dev/null and b/public/images/pokemon/icons/variant/2/212-mega_2.png differ diff --git a/public/images/pokemon/icons/variant/2/212-mega_3.png b/public/images/pokemon/icons/variant/2/212-mega_3.png new file mode 100644 index 000000000..43546d255 Binary files /dev/null and b/public/images/pokemon/icons/variant/2/212-mega_3.png differ diff --git a/public/images/pokemon/icons/variant/2/212_1.png b/public/images/pokemon/icons/variant/2/212_1.png new file mode 100644 index 000000000..e465191ec Binary files /dev/null and b/public/images/pokemon/icons/variant/2/212_1.png differ diff --git a/public/images/pokemon/icons/variant/2/212_2.png b/public/images/pokemon/icons/variant/2/212_2.png new file mode 100644 index 000000000..fe788d5c9 Binary files /dev/null and b/public/images/pokemon/icons/variant/2/212_2.png differ diff --git a/public/images/pokemon/icons/variant/2/212_3.png b/public/images/pokemon/icons/variant/2/212_3.png new file mode 100644 index 000000000..3a85f5151 Binary files /dev/null and b/public/images/pokemon/icons/variant/2/212_3.png differ diff --git a/public/images/pokemon/icons/variant/2/249_2.png b/public/images/pokemon/icons/variant/2/249_2.png new file mode 100644 index 000000000..87b8525c7 Binary files /dev/null and b/public/images/pokemon/icons/variant/2/249_2.png differ diff --git a/public/images/pokemon/icons/variant/2/249_3.png b/public/images/pokemon/icons/variant/2/249_3.png new file mode 100644 index 000000000..b8142d297 Binary files /dev/null and b/public/images/pokemon/icons/variant/2/249_3.png differ diff --git a/public/images/pokemon/icons/variant/2/250_2.png b/public/images/pokemon/icons/variant/2/250_2.png new file mode 100644 index 000000000..cbdd7d6c1 Binary files /dev/null and b/public/images/pokemon/icons/variant/2/250_2.png differ diff --git a/public/images/pokemon/icons/variant/2/250_3.png b/public/images/pokemon/icons/variant/2/250_3.png new file mode 100644 index 000000000..160bc12a5 Binary files /dev/null and b/public/images/pokemon/icons/variant/2/250_3.png differ diff --git a/public/images/pokemon/icons/variant/3/285_2.png b/public/images/pokemon/icons/variant/3/285_2.png new file mode 100644 index 000000000..b05cc520b Binary files /dev/null and b/public/images/pokemon/icons/variant/3/285_2.png differ diff --git a/public/images/pokemon/icons/variant/3/286_2.png b/public/images/pokemon/icons/variant/3/286_2.png new file mode 100644 index 000000000..a0b4f9ba9 Binary files /dev/null and b/public/images/pokemon/icons/variant/3/286_2.png differ diff --git a/public/images/pokemon/icons/variant/3/307_2.png b/public/images/pokemon/icons/variant/3/307_2.png new file mode 100644 index 000000000..13af3fbcf Binary files /dev/null and b/public/images/pokemon/icons/variant/3/307_2.png differ diff --git a/public/images/pokemon/icons/variant/3/307_3.png b/public/images/pokemon/icons/variant/3/307_3.png new file mode 100644 index 000000000..1ad23e203 Binary files /dev/null and b/public/images/pokemon/icons/variant/3/307_3.png differ diff --git a/public/images/pokemon/icons/variant/3/308-mega_2.png b/public/images/pokemon/icons/variant/3/308-mega_2.png new file mode 100644 index 000000000..8a5213092 Binary files /dev/null and b/public/images/pokemon/icons/variant/3/308-mega_2.png differ diff --git a/public/images/pokemon/icons/variant/3/308-mega_3.png b/public/images/pokemon/icons/variant/3/308-mega_3.png new file mode 100644 index 000000000..7e3d7ddc2 Binary files /dev/null and b/public/images/pokemon/icons/variant/3/308-mega_3.png differ diff --git a/public/images/pokemon/icons/variant/3/308_2.png b/public/images/pokemon/icons/variant/3/308_2.png new file mode 100644 index 000000000..d72c502ea Binary files /dev/null and b/public/images/pokemon/icons/variant/3/308_2.png differ diff --git a/public/images/pokemon/icons/variant/3/308_3.png b/public/images/pokemon/icons/variant/3/308_3.png new file mode 100644 index 000000000..135e7bc80 Binary files /dev/null and b/public/images/pokemon/icons/variant/3/308_3.png differ diff --git a/public/images/pokemon/icons/variant/3/334-mega_2.png b/public/images/pokemon/icons/variant/3/334-mega_2.png new file mode 100644 index 000000000..221b5e3c6 Binary files /dev/null and b/public/images/pokemon/icons/variant/3/334-mega_2.png differ diff --git a/public/images/pokemon/icons/variant/3/334-mega_3.png b/public/images/pokemon/icons/variant/3/334-mega_3.png new file mode 100644 index 000000000..cf9f34e70 Binary files /dev/null and b/public/images/pokemon/icons/variant/3/334-mega_3.png differ diff --git a/public/images/pokemon/icons/variant/4/399_2.png b/public/images/pokemon/icons/variant/4/399_2.png new file mode 100644 index 000000000..bdf0093d4 Binary files /dev/null and b/public/images/pokemon/icons/variant/4/399_2.png differ diff --git a/public/images/pokemon/icons/variant/4/399_3.png b/public/images/pokemon/icons/variant/4/399_3.png new file mode 100644 index 000000000..5459fc5a8 Binary files /dev/null and b/public/images/pokemon/icons/variant/4/399_3.png differ diff --git a/public/images/pokemon/icons/variant/4/400_2.png b/public/images/pokemon/icons/variant/4/400_2.png new file mode 100644 index 000000000..b7a5ad3e2 Binary files /dev/null and b/public/images/pokemon/icons/variant/4/400_2.png differ diff --git a/public/images/pokemon/icons/variant/4/400_3.png b/public/images/pokemon/icons/variant/4/400_3.png new file mode 100644 index 000000000..2d4c4c03c Binary files /dev/null and b/public/images/pokemon/icons/variant/4/400_3.png differ diff --git a/public/images/pokemon/icons/variant/4/442_2.png b/public/images/pokemon/icons/variant/4/442_2.png new file mode 100644 index 000000000..9859bb7ce Binary files /dev/null and b/public/images/pokemon/icons/variant/4/442_2.png differ diff --git a/public/images/pokemon/icons/variant/4/442_3.png b/public/images/pokemon/icons/variant/4/442_3.png new file mode 100644 index 000000000..d64848ac4 Binary files /dev/null and b/public/images/pokemon/icons/variant/4/442_3.png differ diff --git a/public/images/pokemon/icons/variant/4/489_1.png b/public/images/pokemon/icons/variant/4/489_1.png new file mode 100644 index 000000000..9cb6e0388 Binary files /dev/null and b/public/images/pokemon/icons/variant/4/489_1.png differ diff --git a/public/images/pokemon/icons/variant/4/489_2.png b/public/images/pokemon/icons/variant/4/489_2.png new file mode 100644 index 000000000..b4e32fe52 Binary files /dev/null and b/public/images/pokemon/icons/variant/4/489_2.png differ diff --git a/public/images/pokemon/icons/variant/4/489_3.png b/public/images/pokemon/icons/variant/4/489_3.png new file mode 100644 index 000000000..428156638 Binary files /dev/null and b/public/images/pokemon/icons/variant/4/489_3.png differ diff --git a/public/images/pokemon/icons/variant/4/490_1.png b/public/images/pokemon/icons/variant/4/490_1.png new file mode 100644 index 000000000..1fda8d15b Binary files /dev/null and b/public/images/pokemon/icons/variant/4/490_1.png differ diff --git a/public/images/pokemon/icons/variant/4/490_2.png b/public/images/pokemon/icons/variant/4/490_2.png new file mode 100644 index 000000000..b9014e88e Binary files /dev/null and b/public/images/pokemon/icons/variant/4/490_2.png differ diff --git a/public/images/pokemon/icons/variant/4/490_3.png b/public/images/pokemon/icons/variant/4/490_3.png new file mode 100644 index 000000000..87a055c99 Binary files /dev/null and b/public/images/pokemon/icons/variant/4/490_3.png differ diff --git a/public/images/pokemon/icons/variant/4/492-land_2.png b/public/images/pokemon/icons/variant/4/492-land_2.png new file mode 100644 index 000000000..fdb71a836 Binary files /dev/null and b/public/images/pokemon/icons/variant/4/492-land_2.png differ diff --git a/public/images/pokemon/icons/variant/4/492-land_3.png b/public/images/pokemon/icons/variant/4/492-land_3.png new file mode 100644 index 000000000..0262fb963 Binary files /dev/null and b/public/images/pokemon/icons/variant/4/492-land_3.png differ diff --git a/public/images/pokemon/icons/variant/4/492-sky_2.png b/public/images/pokemon/icons/variant/4/492-sky_2.png new file mode 100644 index 000000000..6c704ab60 Binary files /dev/null and b/public/images/pokemon/icons/variant/4/492-sky_2.png differ diff --git a/public/images/pokemon/icons/variant/4/492-sky_3.png b/public/images/pokemon/icons/variant/4/492-sky_3.png new file mode 100644 index 000000000..bd18e72a7 Binary files /dev/null and b/public/images/pokemon/icons/variant/4/492-sky_3.png differ diff --git a/public/images/pokemon/icons/variant/5/532_2.png b/public/images/pokemon/icons/variant/5/532_2.png new file mode 100644 index 000000000..81c5ccccd Binary files /dev/null and b/public/images/pokemon/icons/variant/5/532_2.png differ diff --git a/public/images/pokemon/icons/variant/5/532_3.png b/public/images/pokemon/icons/variant/5/532_3.png new file mode 100644 index 000000000..276b7da7b Binary files /dev/null and b/public/images/pokemon/icons/variant/5/532_3.png differ diff --git a/public/images/pokemon/icons/variant/5/533_2.png b/public/images/pokemon/icons/variant/5/533_2.png new file mode 100644 index 000000000..0a0e58b5a Binary files /dev/null and b/public/images/pokemon/icons/variant/5/533_2.png differ diff --git a/public/images/pokemon/icons/variant/5/533_3.png b/public/images/pokemon/icons/variant/5/533_3.png new file mode 100644 index 000000000..abfa6b61c Binary files /dev/null and b/public/images/pokemon/icons/variant/5/533_3.png differ diff --git a/public/images/pokemon/icons/variant/5/534_2.png b/public/images/pokemon/icons/variant/5/534_2.png new file mode 100644 index 000000000..19a37ec32 Binary files /dev/null and b/public/images/pokemon/icons/variant/5/534_2.png differ diff --git a/public/images/pokemon/icons/variant/5/534_3.png b/public/images/pokemon/icons/variant/5/534_3.png new file mode 100644 index 000000000..bb5716ede Binary files /dev/null and b/public/images/pokemon/icons/variant/5/534_3.png differ diff --git a/public/images/pokemon/icons/variant/5/538_2.png b/public/images/pokemon/icons/variant/5/538_2.png new file mode 100644 index 000000000..cce9492da Binary files /dev/null and b/public/images/pokemon/icons/variant/5/538_2.png differ diff --git a/public/images/pokemon/icons/variant/5/538_3.png b/public/images/pokemon/icons/variant/5/538_3.png new file mode 100644 index 000000000..6167c7fbd Binary files /dev/null and b/public/images/pokemon/icons/variant/5/538_3.png differ diff --git a/public/images/pokemon/icons/variant/5/540_2.png b/public/images/pokemon/icons/variant/5/540_2.png new file mode 100644 index 000000000..26123ac72 Binary files /dev/null and b/public/images/pokemon/icons/variant/5/540_2.png differ diff --git a/public/images/pokemon/icons/variant/5/541_2.png b/public/images/pokemon/icons/variant/5/541_2.png new file mode 100644 index 000000000..6e14cea1d Binary files /dev/null and b/public/images/pokemon/icons/variant/5/541_2.png differ diff --git a/public/images/pokemon/icons/variant/5/542_2.png b/public/images/pokemon/icons/variant/5/542_2.png new file mode 100644 index 000000000..c6fab880e Binary files /dev/null and b/public/images/pokemon/icons/variant/5/542_2.png differ diff --git a/public/images/pokemon/icons/variant/6/720-unbound_1.png b/public/images/pokemon/icons/variant/6/720-unbound_1.png new file mode 100644 index 000000000..e0f5e5f9e Binary files /dev/null and b/public/images/pokemon/icons/variant/6/720-unbound_1.png differ diff --git a/public/images/pokemon/icons/variant/6/720-unbound_2.png b/public/images/pokemon/icons/variant/6/720-unbound_2.png new file mode 100644 index 000000000..2ff7b5f8d Binary files /dev/null and b/public/images/pokemon/icons/variant/6/720-unbound_2.png differ diff --git a/public/images/pokemon/icons/variant/6/720-unbound_3.png b/public/images/pokemon/icons/variant/6/720-unbound_3.png new file mode 100644 index 000000000..29aa89b77 Binary files /dev/null and b/public/images/pokemon/icons/variant/6/720-unbound_3.png differ diff --git a/public/images/pokemon/icons/variant/6/720_1.png b/public/images/pokemon/icons/variant/6/720_1.png new file mode 100644 index 000000000..8a7f03ed2 Binary files /dev/null and b/public/images/pokemon/icons/variant/6/720_1.png differ diff --git a/public/images/pokemon/icons/variant/6/720_2.png b/public/images/pokemon/icons/variant/6/720_2.png new file mode 100644 index 000000000..632ccf7e3 Binary files /dev/null and b/public/images/pokemon/icons/variant/6/720_2.png differ diff --git a/public/images/pokemon/icons/variant/6/720_3.png b/public/images/pokemon/icons/variant/6/720_3.png new file mode 100644 index 000000000..7d0ea6130 Binary files /dev/null and b/public/images/pokemon/icons/variant/6/720_3.png differ diff --git a/public/images/pokemon/icons/variant/7/747_2.png b/public/images/pokemon/icons/variant/7/747_2.png new file mode 100644 index 000000000..618e2d036 Binary files /dev/null and b/public/images/pokemon/icons/variant/7/747_2.png differ diff --git a/public/images/pokemon/icons/variant/7/747_3.png b/public/images/pokemon/icons/variant/7/747_3.png new file mode 100644 index 000000000..df4ecf737 Binary files /dev/null and b/public/images/pokemon/icons/variant/7/747_3.png differ diff --git a/public/images/pokemon/icons/variant/7/748_2.png b/public/images/pokemon/icons/variant/7/748_2.png new file mode 100644 index 000000000..7dd1f40be Binary files /dev/null and b/public/images/pokemon/icons/variant/7/748_2.png differ diff --git a/public/images/pokemon/icons/variant/7/748_3.png b/public/images/pokemon/icons/variant/7/748_3.png new file mode 100644 index 000000000..9432853a3 Binary files /dev/null and b/public/images/pokemon/icons/variant/7/748_3.png differ diff --git a/public/images/pokemon/icons/variant/7/789_1.png b/public/images/pokemon/icons/variant/7/789_1.png new file mode 100644 index 000000000..fe970efa3 Binary files /dev/null and b/public/images/pokemon/icons/variant/7/789_1.png differ diff --git a/public/images/pokemon/icons/variant/7/791_1.png b/public/images/pokemon/icons/variant/7/791_1.png new file mode 100644 index 000000000..dfba58f03 Binary files /dev/null and b/public/images/pokemon/icons/variant/7/791_1.png differ diff --git a/public/images/pokemon/icons/variant/8/856_2.png b/public/images/pokemon/icons/variant/8/856_2.png new file mode 100644 index 000000000..6474bf086 Binary files /dev/null and b/public/images/pokemon/icons/variant/8/856_2.png differ diff --git a/public/images/pokemon/icons/variant/8/856_3.png b/public/images/pokemon/icons/variant/8/856_3.png new file mode 100644 index 000000000..c5898aa47 Binary files /dev/null and b/public/images/pokemon/icons/variant/8/856_3.png differ diff --git a/public/images/pokemon/icons/variant/8/857_2.png b/public/images/pokemon/icons/variant/8/857_2.png new file mode 100644 index 000000000..b1a4c2f82 Binary files /dev/null and b/public/images/pokemon/icons/variant/8/857_2.png differ diff --git a/public/images/pokemon/icons/variant/8/857_3.png b/public/images/pokemon/icons/variant/8/857_3.png new file mode 100644 index 000000000..d04b631f6 Binary files /dev/null and b/public/images/pokemon/icons/variant/8/857_3.png differ diff --git a/public/images/pokemon/icons/variant/8/858_2.png b/public/images/pokemon/icons/variant/8/858_2.png new file mode 100644 index 000000000..c129c2df0 Binary files /dev/null and b/public/images/pokemon/icons/variant/8/858_2.png differ diff --git a/public/images/pokemon/icons/variant/8/858_3.png b/public/images/pokemon/icons/variant/8/858_3.png new file mode 100644 index 000000000..499312644 Binary files /dev/null and b/public/images/pokemon/icons/variant/8/858_3.png differ diff --git a/public/images/pokemon/icons/variant/8/877-hangry_1.png b/public/images/pokemon/icons/variant/8/877-hangry_1.png new file mode 100644 index 000000000..9ccfcba6d Binary files /dev/null and b/public/images/pokemon/icons/variant/8/877-hangry_1.png differ diff --git a/public/images/pokemon/icons/variant/8/877-hangry_2.png b/public/images/pokemon/icons/variant/8/877-hangry_2.png new file mode 100644 index 000000000..03c6e48a6 Binary files /dev/null and b/public/images/pokemon/icons/variant/8/877-hangry_2.png differ diff --git a/public/images/pokemon/icons/variant/8/877-hangry_3.png b/public/images/pokemon/icons/variant/8/877-hangry_3.png new file mode 100644 index 000000000..5dbf6ca7c Binary files /dev/null and b/public/images/pokemon/icons/variant/8/877-hangry_3.png differ diff --git a/public/images/pokemon/icons/variant/8/877_1.png b/public/images/pokemon/icons/variant/8/877_1.png new file mode 100644 index 000000000..c9cd435fa Binary files /dev/null and b/public/images/pokemon/icons/variant/8/877_1.png differ diff --git a/public/images/pokemon/icons/variant/8/877_2.png b/public/images/pokemon/icons/variant/8/877_2.png new file mode 100644 index 000000000..bfebde92e Binary files /dev/null and b/public/images/pokemon/icons/variant/8/877_2.png differ diff --git a/public/images/pokemon/icons/variant/8/877_3.png b/public/images/pokemon/icons/variant/8/877_3.png new file mode 100644 index 000000000..8fb654de9 Binary files /dev/null and b/public/images/pokemon/icons/variant/8/877_3.png differ diff --git a/public/images/pokemon/icons/variant/8/885_1.png b/public/images/pokemon/icons/variant/8/885_1.png new file mode 100644 index 000000000..ec0849c4a Binary files /dev/null and b/public/images/pokemon/icons/variant/8/885_1.png differ diff --git a/public/images/pokemon/icons/variant/8/885_2.png b/public/images/pokemon/icons/variant/8/885_2.png new file mode 100644 index 000000000..5b19fac08 Binary files /dev/null and b/public/images/pokemon/icons/variant/8/885_2.png differ diff --git a/public/images/pokemon/icons/variant/8/885_3.png b/public/images/pokemon/icons/variant/8/885_3.png new file mode 100644 index 000000000..3938810e1 Binary files /dev/null and b/public/images/pokemon/icons/variant/8/885_3.png differ diff --git a/public/images/pokemon/icons/variant/8/886_1.png b/public/images/pokemon/icons/variant/8/886_1.png new file mode 100644 index 000000000..0001af872 Binary files /dev/null and b/public/images/pokemon/icons/variant/8/886_1.png differ diff --git a/public/images/pokemon/icons/variant/8/886_2.png b/public/images/pokemon/icons/variant/8/886_2.png new file mode 100644 index 000000000..b49491cba Binary files /dev/null and b/public/images/pokemon/icons/variant/8/886_2.png differ diff --git a/public/images/pokemon/icons/variant/8/886_3.png b/public/images/pokemon/icons/variant/8/886_3.png new file mode 100644 index 000000000..5de076df7 Binary files /dev/null and b/public/images/pokemon/icons/variant/8/886_3.png differ diff --git a/public/images/pokemon/icons/variant/8/887_2.png b/public/images/pokemon/icons/variant/8/887_2.png new file mode 100644 index 000000000..28a337f29 Binary files /dev/null and b/public/images/pokemon/icons/variant/8/887_2.png differ diff --git a/public/images/pokemon/icons/variant/8/887_3.png b/public/images/pokemon/icons/variant/8/887_3.png new file mode 100644 index 000000000..12507e422 Binary files /dev/null and b/public/images/pokemon/icons/variant/8/887_3.png differ diff --git a/public/images/pokemon/icons/variant/8/900_2.png b/public/images/pokemon/icons/variant/8/900_2.png new file mode 100644 index 000000000..376c1dbe7 Binary files /dev/null and b/public/images/pokemon/icons/variant/8/900_2.png differ diff --git a/public/images/pokemon/icons/variant/8/900_3.png b/public/images/pokemon/icons/variant/8/900_3.png new file mode 100644 index 000000000..9e2fb2a91 Binary files /dev/null and b/public/images/pokemon/icons/variant/8/900_3.png differ diff --git a/public/images/pokemon/icons/variant/9/967_2.png b/public/images/pokemon/icons/variant/9/967_2.png new file mode 100644 index 000000000..a8b7935f1 Binary files /dev/null and b/public/images/pokemon/icons/variant/9/967_2.png differ diff --git a/public/images/pokemon_icons_1v.json b/public/images/pokemon_icons_1v.json index 27d021786..2947909f3 100644 --- a/public/images/pokemon_icons_1v.json +++ b/public/images/pokemon_icons_1v.json @@ -4,8 +4,8 @@ "image": "pokemon_icons_1v.png", "format": "RGBA8888", "size": { - "w": 226, - "h": 226 + "w": 236, + "h": 236 }, "scale": 1, "frames": [ @@ -150,52 +150,10 @@ "h": 30 }, "frame": { - "x": 0, - "y": 30, - "w": 25, - "h": 30 - } - }, - { - "filename": "52-gigantamax_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, + "x": 210, "y": 0, "w": 25, "h": 30 - }, - "frame": { - "x": 0, - "y": 60, - "w": 25, - "h": 30 - } - }, - { - "filename": "52-gigantamax_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 25, - "h": 30 - }, - "frame": { - "x": 0, - "y": 90, - "w": 25, - "h": 30 } }, { @@ -214,7 +172,7 @@ }, "frame": { "x": 0, - "y": 120, + "y": 30, "w": 33, "h": 29 } @@ -235,7 +193,7 @@ }, "frame": { "x": 0, - "y": 149, + "y": 59, "w": 33, "h": 29 } @@ -256,53 +214,11 @@ }, "frame": { "x": 0, - "y": 178, + "y": 88, "w": 32, "h": 28 } }, - { - "filename": "146_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 30, - "h": 20 - }, - "frame": { - "x": 0, - "y": 206, - "w": 30, - "h": 20 - } - }, - { - "filename": "146_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 30, - "h": 20 - }, - "frame": { - "x": 30, - "y": 206, - "w": 30, - "h": 20 - } - }, { "filename": "93_2", "rotated": false, @@ -318,33 +234,12 @@ "h": 28 }, "frame": { - "x": 32, - "y": 178, + "x": 0, + "y": 116, "w": 32, "h": 28 } }, - { - "filename": "146_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 30, - "h": 20 - }, - "frame": { - "x": 60, - "y": 206, - "w": 30, - "h": 20 - } - }, { "filename": "93_3", "rotated": false, @@ -360,14 +255,14 @@ "h": 28 }, "frame": { - "x": 25, - "y": 30, + "x": 0, + "y": 144, "w": 32, "h": 28 } }, { - "filename": "151_2", + "filename": "52-gigantamax_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -375,20 +270,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 1, + "x": 6, + "y": 0, "w": 25, - "h": 27 + "h": 30 }, "frame": { - "x": 25, - "y": 58, + "x": 0, + "y": 172, "w": 25, - "h": 27 + "h": 30 } }, { - "filename": "151_3", + "filename": "52-gigantamax_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -396,16 +291,37 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 1, + "x": 6, + "y": 0, "w": 25, - "h": 27 + "h": 30 + }, + "frame": { + "x": 0, + "y": 202, + "w": 25, + "h": 30 + } + }, + { + "filename": "71_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 4, + "w": 30, + "h": 25 }, "frame": { "x": 25, - "y": 85, - "w": 25, - "h": 27 + "y": 172, + "w": 30, + "h": 25 } }, { @@ -423,8 +339,8 @@ "h": 26 }, "frame": { - "x": 33, - "y": 112, + "x": 25, + "y": 197, "w": 26, "h": 26 } @@ -444,8 +360,8 @@ "h": 26 }, "frame": { - "x": 33, - "y": 138, + "x": 51, + "y": 197, "w": 26, "h": 26 } @@ -465,12 +381,54 @@ "h": 26 }, "frame": { - "x": 50, - "y": 58, + "x": 32, + "y": 88, "w": 26, "h": 26 } }, + { + "filename": "151_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 1, + "w": 25, + "h": 27 + }, + "frame": { + "x": 33, + "y": 30, + "w": 25, + "h": 27 + } + }, + { + "filename": "151_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 1, + "w": 25, + "h": 27 + }, + "frame": { + "x": 33, + "y": 57, + "w": 25, + "h": 27 + } + }, { "filename": "86_1", "rotated": false, @@ -486,8 +444,8 @@ "h": 25 }, "frame": { - "x": 57, - "y": 30, + "x": 32, + "y": 114, "w": 27, "h": 25 } @@ -507,8 +465,8 @@ "h": 25 }, "frame": { - "x": 50, - "y": 84, + "x": 32, + "y": 139, "w": 27, "h": 25 } @@ -528,8 +486,8 @@ "h": 25 }, "frame": { - "x": 76, - "y": 55, + "x": 55, + "y": 164, "w": 27, "h": 25 } @@ -549,12 +507,33 @@ "h": 25 }, "frame": { - "x": 84, - "y": 30, + "x": 77, + "y": 189, "w": 27, "h": 25 } }, + { + "filename": "145_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 31, + "h": 21 + }, + "frame": { + "x": 77, + "y": 214, + "w": 31, + "h": 21 + } + }, { "filename": "87_2", "rotated": false, @@ -570,8 +549,8 @@ "h": 25 }, "frame": { - "x": 59, - "y": 109, + "x": 58, + "y": 30, "w": 27, "h": 25 } @@ -591,12 +570,54 @@ "h": 25 }, "frame": { - "x": 77, - "y": 80, + "x": 58, + "y": 55, "w": 27, "h": 25 } }, + { + "filename": "145_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 31, + "h": 21 + }, + "frame": { + "x": 58, + "y": 80, + "w": 31, + "h": 21 + } + }, + { + "filename": "145_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 31, + "h": 21 + }, + "frame": { + "x": 85, + "y": 30, + "w": 31, + "h": 21 + } + }, { "filename": "149_2", "rotated": false, @@ -612,8 +633,8 @@ "h": 24 }, "frame": { - "x": 103, - "y": 55, + "x": 85, + "y": 51, "w": 27, "h": 24 } @@ -633,12 +654,96 @@ "h": 24 }, "frame": { - "x": 111, - "y": 30, + "x": 59, + "y": 101, "w": 27, "h": 24 } }, + { + "filename": "144_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 29, + "h": 22 + }, + "frame": { + "x": 59, + "y": 125, + "w": 29, + "h": 22 + } + }, + { + "filename": "69_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 12, + "w": 22, + "h": 17 + }, + "frame": { + "x": 59, + "y": 147, + "w": 22, + "h": 17 + } + }, + { + "filename": "144_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 29, + "h": 22 + }, + "frame": { + "x": 86, + "y": 101, + "w": 29, + "h": 22 + } + }, + { + "filename": "144_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 29, + "h": 22 + }, + "frame": { + "x": 89, + "y": 75, + "w": 29, + "h": 22 + } + }, { "filename": "53_1", "rotated": false, @@ -654,14 +759,14 @@ "h": 24 }, "frame": { - "x": 59, - "y": 134, + "x": 112, + "y": 51, "w": 25, "h": 24 } }, { - "filename": "147_2", + "filename": "146_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -669,15 +774,15 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 9, - "w": 22, + "x": 6, + "y": 7, + "w": 30, "h": 20 }, "frame": { - "x": 59, - "y": 158, - "w": 22, + "x": 116, + "y": 30, + "w": 30, "h": 20 } }, @@ -696,33 +801,12 @@ "h": 24 }, "frame": { - "x": 64, - "y": 178, + "x": 82, + "y": 147, "w": 25, "h": 24 } }, - { - "filename": "147_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 9, - "w": 22, - "h": 20 - }, - "frame": { - "x": 81, - "y": 158, - "w": 22, - "h": 20 - } - }, { "filename": "53_3", "rotated": false, @@ -738,14 +822,14 @@ "h": 24 }, "frame": { - "x": 84, - "y": 134, + "x": 88, + "y": 123, "w": 25, "h": 24 } }, { - "filename": "47_1", + "filename": "146_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -753,41 +837,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 24, - "h": 24 - }, - "frame": { - "x": 89, - "y": 178, - "w": 24, - "h": 24 - } - }, - { - "filename": "133_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 19, + "x": 6, + "y": 7, + "w": 30, "h": 20 }, "frame": { - "x": 103, - "y": 158, - "w": 19, + "x": 104, + "y": 171, + "w": 30, "h": 20 } }, { - "filename": "47_2", + "filename": "146_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -795,79 +858,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 24, - "h": 24 + "x": 6, + "y": 7, + "w": 30, + "h": 20 }, "frame": { - "x": 90, - "y": 202, - "w": 24, - "h": 24 - } - }, - { - "filename": "47_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 24, - "h": 24 - }, - "frame": { - "x": 113, - "y": 178, - "w": 24, - "h": 24 - } - }, - { - "filename": "148_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 24, - "h": 24 - }, - "frame": { - "x": 114, - "y": 202, - "w": 24, - "h": 24 - } - }, - { - "filename": "148_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 24, - "h": 24 - }, - "frame": { - "x": 86, - "y": 105, - "w": 24, - "h": 24 + "x": 104, + "y": 191, + "w": 30, + "h": 20 } }, { @@ -885,8 +885,8 @@ "h": 23 }, "frame": { - "x": 104, - "y": 79, + "x": 107, + "y": 147, "w": 26, "h": 23 } @@ -906,12 +906,159 @@ "h": 23 }, "frame": { - "x": 109, - "y": 129, + "x": 113, + "y": 123, "w": 26, "h": 23 } }, + { + "filename": "47_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 24, + "h": 24 + }, + "frame": { + "x": 133, + "y": 146, + "w": 24, + "h": 24 + } + }, + { + "filename": "47_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 24, + "h": 24 + }, + "frame": { + "x": 115, + "y": 97, + "w": 24, + "h": 24 + } + }, + { + "filename": "46_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 24, + "h": 22 + }, + "frame": { + "x": 118, + "y": 75, + "w": 24, + "h": 22 + } + }, + { + "filename": "47_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 24, + "h": 24 + }, + "frame": { + "x": 137, + "y": 50, + "w": 24, + "h": 24 + } + }, + { + "filename": "147_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 9, + "w": 22, + "h": 20 + }, + "frame": { + "x": 146, + "y": 30, + "w": 22, + "h": 20 + } + }, + { + "filename": "148_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 24, + "h": 24 + }, + "frame": { + "x": 108, + "y": 211, + "w": 24, + "h": 24 + } + }, + { + "filename": "148_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 24, + "h": 24 + }, + "frame": { + "x": 132, + "y": 211, + "w": 24, + "h": 24 + } + }, { "filename": "92_1", "rotated": false, @@ -927,8 +1074,8 @@ "h": 23 }, "frame": { - "x": 122, - "y": 152, + "x": 134, + "y": 170, "w": 25, "h": 23 } @@ -948,12 +1095,54 @@ "h": 23 }, "frame": { - "x": 137, - "y": 175, + "x": 156, + "y": 193, "w": 25, "h": 23 } }, + { + "filename": "147_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 9, + "w": 22, + "h": 20 + }, + "frame": { + "x": 156, + "y": 216, + "w": 22, + "h": 20 + } + }, + { + "filename": "133_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 9, + "w": 19, + "h": 20 + }, + "frame": { + "x": 178, + "y": 216, + "w": 19, + "h": 20 + } + }, { "filename": "92_3", "rotated": false, @@ -969,8 +1158,8 @@ "h": 23 }, "frame": { - "x": 110, - "y": 102, + "x": 139, + "y": 97, "w": 25, "h": 23 } @@ -990,8 +1179,8 @@ "h": 23 }, "frame": { - "x": 138, - "y": 198, + "x": 142, + "y": 74, "w": 25, "h": 23 } @@ -1011,12 +1200,33 @@ "h": 23 }, "frame": { - "x": 130, - "y": 54, + "x": 161, + "y": 50, "w": 25, "h": 23 } }, + { + "filename": "133_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 9, + "w": 19, + "h": 20 + }, + "frame": { + "x": 168, + "y": 30, + "w": 19, + "h": 20 + } + }, { "filename": "136_1", "rotated": false, @@ -1032,8 +1242,8 @@ "h": 23 }, "frame": { - "x": 138, - "y": 30, + "x": 139, + "y": 120, "w": 25, "h": 23 } @@ -1053,8 +1263,8 @@ "h": 23 }, "frame": { - "x": 130, - "y": 77, + "x": 157, + "y": 143, "w": 25, "h": 23 } @@ -1074,12 +1284,96 @@ "h": 23 }, "frame": { - "x": 135, - "y": 100, + "x": 159, + "y": 166, "w": 25, "h": 23 } }, + { + "filename": "36_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 22, + "h": 25 + }, + "frame": { + "x": 181, + "y": 189, + "w": 22, + "h": 25 + } + }, + { + "filename": "46_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 24, + "h": 22 + }, + "frame": { + "x": 197, + "y": 214, + "w": 24, + "h": 22 + } + }, + { + "filename": "150_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 22, + "h": 25 + }, + "frame": { + "x": 164, + "y": 97, + "w": 22, + "h": 25 + } + }, + { + "filename": "123_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 21, + "h": 21 + }, + "frame": { + "x": 164, + "y": 122, + "w": 21, + "h": 21 + } + }, { "filename": "52_1", "rotated": false, @@ -1095,12 +1389,33 @@ "h": 23 }, "frame": { - "x": 135, - "y": 123, + "x": 182, + "y": 143, "w": 23, "h": 23 } }, + { + "filename": "123_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 21, + "h": 21 + }, + "frame": { + "x": 185, + "y": 122, + "w": 21, + "h": 21 + } + }, { "filename": "52_2", "rotated": false, @@ -1116,8 +1431,8 @@ "h": 23 }, "frame": { - "x": 147, - "y": 146, + "x": 184, + "y": 166, "w": 23, "h": 23 } @@ -1137,12 +1452,75 @@ "h": 23 }, "frame": { - "x": 158, - "y": 123, + "x": 205, + "y": 143, "w": 23, "h": 23 } }, + { + "filename": "150_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 22, + "h": 25 + }, + "frame": { + "x": 203, + "y": 189, + "w": 22, + "h": 25 + } + }, + { + "filename": "46_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 24, + "h": 22 + }, + "frame": { + "x": 207, + "y": 166, + "w": 24, + "h": 22 + } + }, + { + "filename": "70_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 24, + "h": 22 + }, + "frame": { + "x": 167, + "y": 73, + "w": 24, + "h": 22 + } + }, { "filename": "135_1", "rotated": false, @@ -1158,8 +1536,8 @@ "h": 23 }, "frame": { - "x": 162, - "y": 169, + "x": 186, + "y": 50, "w": 22, "h": 23 } @@ -1179,96 +1557,12 @@ "h": 23 }, "frame": { - "x": 170, - "y": 146, + "x": 186, + "y": 95, "w": 22, "h": 23 } }, - { - "filename": "145_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 31, - "h": 21 - }, - "frame": { - "x": 192, - "y": 30, - "w": 31, - "h": 21 - } - }, - { - "filename": "144_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 29, - "h": 22 - }, - "frame": { - "x": 163, - "y": 30, - "w": 29, - "h": 22 - } - }, - { - "filename": "145_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 31, - "h": 21 - }, - "frame": { - "x": 192, - "y": 51, - "w": 31, - "h": 21 - } - }, - { - "filename": "144_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 29, - "h": 22 - }, - "frame": { - "x": 163, - "y": 52, - "w": 29, - "h": 22 - } - }, { "filename": "135_3", "rotated": false, @@ -1284,75 +1578,12 @@ "h": 23 }, "frame": { - "x": 155, - "y": 74, + "x": 206, + "y": 118, "w": 22, "h": 23 } }, - { - "filename": "145_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 31, - "h": 21 - }, - "frame": { - "x": 192, - "y": 72, - "w": 31, - "h": 21 - } - }, - { - "filename": "144_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 29, - "h": 22 - }, - "frame": { - "x": 160, - "y": 97, - "w": 29, - "h": 22 - } - }, - { - "filename": "46_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 24, - "h": 22 - }, - "frame": { - "x": 181, - "y": 119, - "w": 24, - "h": 22 - } - }, { "filename": "113_1", "rotated": false, @@ -1368,8 +1599,8 @@ "h": 22 }, "frame": { - "x": 205, - "y": 93, + "x": 191, + "y": 73, "w": 21, "h": 22 } @@ -1389,8 +1620,8 @@ "h": 22 }, "frame": { - "x": 205, - "y": 115, + "x": 208, + "y": 95, "w": 21, "h": 22 } @@ -1410,14 +1641,14 @@ "h": 22 }, "frame": { - "x": 205, - "y": 137, + "x": 208, + "y": 30, "w": 21, "h": 22 } }, { - "filename": "46_2", + "filename": "123_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -1425,41 +1656,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 24, - "h": 22 + "x": 10, + "y": 8, + "w": 21, + "h": 21 }, "frame": { - "x": 192, - "y": 159, - "w": 24, - "h": 22 + "x": 208, + "y": 52, + "w": 21, + "h": 21 } }, { - "filename": "46_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 24, - "h": 22 - }, - "frame": { - "x": 163, - "y": 192, - "w": 24, - "h": 22 - } - }, - { - "filename": "133_3", + "filename": "35_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -1468,15 +1678,15 @@ }, "spriteSourceSize": { "x": 11, - "y": 9, - "w": 19, - "h": 20 + "y": 8, + "w": 20, + "h": 21 }, "frame": { - "x": 187, - "y": 181, - "w": 19, - "h": 20 + "x": 212, + "y": 73, + "w": 20, + "h": 21 } } ] @@ -1485,6 +1695,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:610d174f476a3db4f4ff70c2a94f0072:49e0788bf472a9b68815b3ed527e2fe0:2fc2d7db306a93e9369e20846ccef45c$" + "smartupdate": "$TexturePacker:SmartUpdate:9c3e9a6bc3ccc54e83847b1b82609b16:5746474b7532e99711726e259e441d35:2fc2d7db306a93e9369e20846ccef45c$" } } diff --git a/public/images/pokemon_icons_1v.png b/public/images/pokemon_icons_1v.png index 379576254..f649ff9c2 100644 Binary files a/public/images/pokemon_icons_1v.png and b/public/images/pokemon_icons_1v.png differ diff --git a/public/images/pokemon_icons_2v.json b/public/images/pokemon_icons_2v.json index 32715687f..fc45e4aa6 100644 --- a/public/images/pokemon_icons_2v.json +++ b/public/images/pokemon_icons_2v.json @@ -4,13 +4,13 @@ "image": "pokemon_icons_2v.png", "format": "RGBA8888", "size": { - "w": 143, - "h": 143 + "w": 172, + "h": 172 }, "scale": 1, "frames": [ { - "filename": "243_2", + "filename": "249_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -18,20 +18,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 32, - "h": 27 + "x": 3, + "y": 0, + "w": 34, + "h": 30 }, "frame": { "x": 0, "y": 0, - "w": 32, - "h": 27 + "w": 34, + "h": 30 } }, { - "filename": "243_3", + "filename": "249_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -39,16 +39,121 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 32, - "h": 27 + "x": 3, + "y": 0, + "w": 34, + "h": 30 }, "frame": { - "x": 32, + "x": 34, "y": 0, - "w": 32, - "h": 27 + "w": 34, + "h": 30 + } + }, + { + "filename": "250_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 0, + "w": 31, + "h": 30 + }, + "frame": { + "x": 68, + "y": 0, + "w": 31, + "h": 30 + } + }, + { + "filename": "250_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 0, + "w": 31, + "h": 30 + }, + "frame": { + "x": 99, + "y": 0, + "w": 31, + "h": 30 + } + }, + { + "filename": "212-mega_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 3, + "y": 0, + "w": 30, + "h": 30 + }, + "frame": { + "x": 130, + "y": 0, + "w": 30, + "h": 30 + } + }, + { + "filename": "212-mega_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 3, + "y": 0, + "w": 30, + "h": 30 + }, + "frame": { + "x": 0, + "y": 30, + "w": 30, + "h": 30 + } + }, + { + "filename": "212-mega_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 3, + "y": 0, + "w": 30, + "h": 30 + }, + "frame": { + "x": 0, + "y": 60, + "w": 30, + "h": 30 } }, { @@ -66,8 +171,8 @@ "h": 28 }, "frame": { - "x": 64, - "y": 0, + "x": 0, + "y": 90, "w": 31, "h": 28 } @@ -87,14 +192,14 @@ "h": 28 }, "frame": { - "x": 95, - "y": 0, + "x": 30, + "y": 30, "w": 31, "h": 28 } }, { - "filename": "251_2", + "filename": "243_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -102,20 +207,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 16, - "h": 20 + "x": 4, + "y": 2, + "w": 32, + "h": 27 }, "frame": { - "x": 126, - "y": 0, - "w": 16, - "h": 20 + "x": 30, + "y": 58, + "w": 32, + "h": 27 } }, { - "filename": "251_3", + "filename": "243_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -123,16 +228,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 16, - "h": 20 + "x": 4, + "y": 2, + "w": 32, + "h": 27 }, "frame": { - "x": 126, - "y": 20, - "w": 16, - "h": 20 + "x": 61, + "y": 30, + "w": 32, + "h": 27 } }, { @@ -151,7 +256,7 @@ }, "frame": { "x": 0, - "y": 27, + "y": 118, "w": 31, "h": 27 } @@ -171,14 +276,14 @@ "h": 27 }, "frame": { - "x": 31, - "y": 27, + "x": 0, + "y": 145, "w": 31, "h": 27 } }, { - "filename": "196_1", + "filename": "212_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -186,20 +291,41 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 29, - "h": 23 + "x": 5, + "y": 0, + "w": 28, + "h": 29 + }, + "frame": { + "x": 93, + "y": 30, + "w": 28, + "h": 29 + } + }, + { + "filename": "212_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 0, + "w": 28, + "h": 29 }, "frame": { "x": 62, - "y": 28, - "w": 29, - "h": 23 + "y": 57, + "w": 28, + "h": 29 } }, { - "filename": "196_2", + "filename": "212_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -207,58 +333,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 29, - "h": 23 + "x": 5, + "y": 0, + "w": 28, + "h": 29 }, "frame": { - "x": 91, - "y": 28, - "w": 29, - "h": 23 - } - }, - { - "filename": "180_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 23, - "h": 24 - }, - "frame": { - "x": 120, - "y": 40, - "w": 23, - "h": 24 - } - }, - { - "filename": "196_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 29, - "h": 23 - }, - "frame": { - "x": 62, - "y": 51, - "w": 29, - "h": 23 + "x": 31, + "y": 85, + "w": 28, + "h": 29 } }, { @@ -276,33 +360,12 @@ "h": 26 }, "frame": { - "x": 91, - "y": 51, + "x": 121, + "y": 30, "w": 27, "h": 26 } }, - { - "filename": "242_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 24, - "h": 24 - }, - "frame": { - "x": 118, - "y": 64, - "w": 24, - "h": 24 - } - }, { "filename": "181_2", "rotated": false, @@ -318,29 +381,8 @@ "h": 27 }, "frame": { - "x": 0, - "y": 88, - "w": 22, - "h": 27 - } - }, - { - "filename": "181_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 2, - "w": 22, - "h": 27 - }, - "frame": { - "x": 0, - "y": 115, + "x": 148, + "y": 30, "w": 22, "h": 27 } @@ -360,12 +402,117 @@ "h": 26 }, "frame": { - "x": 0, - "y": 54, + "x": 121, + "y": 56, "w": 27, "h": 26 } }, + { + "filename": "181_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 2, + "w": 22, + "h": 27 + }, + "frame": { + "x": 148, + "y": 57, + "w": 22, + "h": 27 + } + }, + { + "filename": "196_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 29, + "h": 23 + }, + "frame": { + "x": 90, + "y": 59, + "w": 29, + "h": 23 + } + }, + { + "filename": "196_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 29, + "h": 23 + }, + "frame": { + "x": 90, + "y": 82, + "w": 29, + "h": 23 + } + }, + { + "filename": "196_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 29, + "h": 23 + }, + "frame": { + "x": 119, + "y": 82, + "w": 29, + "h": 23 + } + }, + { + "filename": "242_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 24, + "h": 24 + }, + "frame": { + "x": 148, + "y": 84, + "w": 24, + "h": 24 + } + }, { "filename": "242_2", "rotated": false, @@ -381,8 +528,8 @@ "h": 24 }, "frame": { - "x": 27, - "y": 54, + "x": 59, + "y": 86, "w": 24, "h": 24 } @@ -402,12 +549,54 @@ "h": 24 }, "frame": { - "x": 51, - "y": 74, + "x": 83, + "y": 105, "w": 24, "h": 24 } }, + { + "filename": "180_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 23, + "h": 24 + }, + "frame": { + "x": 59, + "y": 110, + "w": 23, + "h": 24 + } + }, + { + "filename": "180_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 23, + "h": 24 + }, + "frame": { + "x": 31, + "y": 114, + "w": 23, + "h": 24 + } + }, { "filename": "179_2", "rotated": false, @@ -423,12 +612,33 @@ "h": 22 }, "frame": { - "x": 27, - "y": 78, + "x": 107, + "y": 105, "w": 24, "h": 22 } }, + { + "filename": "251_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 8, + "w": 16, + "h": 20 + }, + "frame": { + "x": 131, + "y": 105, + "w": 16, + "h": 20 + } + }, { "filename": "179_3", "rotated": false, @@ -444,12 +654,33 @@ "h": 22 }, "frame": { - "x": 75, - "y": 77, + "x": 147, + "y": 108, "w": 24, "h": 22 } }, + { + "filename": "251_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 8, + "w": 16, + "h": 20 + }, + "frame": { + "x": 131, + "y": 125, + "w": 16, + "h": 20 + } + }, { "filename": "176_1", "rotated": false, @@ -465,14 +696,14 @@ "h": 23 }, "frame": { - "x": 99, - "y": 77, + "x": 147, + "y": 130, "w": 19, "h": 23 } }, { - "filename": "180_3", + "filename": "176_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -480,16 +711,37 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 23, - "h": 24 + "x": 10, + "y": 6, + "w": 19, + "h": 23 }, "frame": { - "x": 51, - "y": 98, - "w": 23, - "h": 24 + "x": 107, + "y": 127, + "w": 19, + "h": 23 + } + }, + { + "filename": "176_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 19, + "h": 23 + }, + "frame": { + "x": 126, + "y": 145, + "w": 19, + "h": 23 } }, { @@ -507,8 +759,8 @@ "h": 21 }, "frame": { - "x": 22, - "y": 122, + "x": 82, + "y": 129, "w": 18, "h": 21 } @@ -528,8 +780,8 @@ "h": 21 }, "frame": { - "x": 40, - "y": 122, + "x": 54, + "y": 134, "w": 18, "h": 21 } @@ -549,33 +801,12 @@ "h": 21 }, "frame": { - "x": 58, - "y": 122, + "x": 31, + "y": 138, "w": 18, "h": 21 } }, - { - "filename": "176_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 23 - }, - "frame": { - "x": 74, - "y": 99, - "w": 19, - "h": 23 - } - }, { "filename": "175_1", "rotated": false, @@ -591,8 +822,8 @@ "h": 20 }, "frame": { - "x": 76, - "y": 122, + "x": 72, + "y": 150, "w": 18, "h": 20 } @@ -612,8 +843,8 @@ "h": 20 }, "frame": { - "x": 22, - "y": 100, + "x": 90, + "y": 150, "w": 18, "h": 20 } @@ -633,32 +864,11 @@ "h": 20 }, "frame": { - "x": 93, - "y": 100, + "x": 108, + "y": 150, "w": 18, "h": 20 } - }, - { - "filename": "176_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 23 - }, - "frame": { - "x": 94, - "y": 120, - "w": 19, - "h": 23 - } } ] } @@ -666,6 +876,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:bd17a6fc1f7cfeefba63f95072dc36ee:08778df4168ec2ffe76c5334db562bb8:63b368599cdc6e139499267117e91cd5$" + "smartupdate": "$TexturePacker:SmartUpdate:6310029c7c952ab1cbe44afc3457e17e:1a12301221d88d32514ea2c936da81f3:63b368599cdc6e139499267117e91cd5$" } } diff --git a/public/images/pokemon_icons_2v.png b/public/images/pokemon_icons_2v.png index 2f5aba102..9eb0d6334 100644 Binary files a/public/images/pokemon_icons_2v.png and b/public/images/pokemon_icons_2v.png differ diff --git a/public/images/pokemon_icons_3v.json b/public/images/pokemon_icons_3v.json index 7b312266a..b37c54213 100644 --- a/public/images/pokemon_icons_3v.json +++ b/public/images/pokemon_icons_3v.json @@ -4,8 +4,8 @@ "image": "pokemon_icons_3v.png", "format": "RGBA8888", "size": { - "w": 145, - "h": 145 + "w": 161, + "h": 161 }, "scale": 1, "frames": [ @@ -45,8 +45,8 @@ "h": 27 }, "frame": { - "x": 40, - "y": 0, + "x": 0, + "y": 27, "w": 40, "h": 27 } @@ -66,12 +66,33 @@ "h": 29 }, "frame": { - "x": 80, + "x": 40, "y": 0, "w": 33, "h": 29 } }, + { + "filename": "384_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 1, + "w": 33, + "h": 29 + }, + "frame": { + "x": 0, + "y": 54, + "w": 33, + "h": 29 + } + }, { "filename": "303-mega_1", "rotated": false, @@ -87,7 +108,7 @@ "h": 28 }, "frame": { - "x": 113, + "x": 73, "y": 0, "w": 32, "h": 28 @@ -108,33 +129,12 @@ "h": 28 }, "frame": { - "x": 113, - "y": 28, + "x": 0, + "y": 83, "w": 32, "h": 28 } }, - { - "filename": "384_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 33, - "h": 29 - }, - "frame": { - "x": 0, - "y": 27, - "w": 33, - "h": 29 - } - }, { "filename": "303-mega_3", "rotated": false, @@ -150,12 +150,138 @@ "h": 28 }, "frame": { - "x": 33, - "y": 27, + "x": 105, + "y": 0, "w": 32, "h": 28 } }, + { + "filename": "264_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 24, + "h": 22 + }, + "frame": { + "x": 137, + "y": 0, + "w": 24, + "h": 22 + } + }, + { + "filename": "308-mega_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 1, + "w": 31, + "h": 29 + }, + "frame": { + "x": 0, + "y": 111, + "w": 31, + "h": 29 + } + }, + { + "filename": "328_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 21, + "h": 21 + }, + "frame": { + "x": 0, + "y": 140, + "w": 21, + "h": 21 + } + }, + { + "filename": "308-mega_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 1, + "w": 31, + "h": 29 + }, + "frame": { + "x": 40, + "y": 29, + "w": 31, + "h": 29 + } + }, + { + "filename": "264_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 24, + "h": 22 + }, + "frame": { + "x": 137, + "y": 22, + "w": 24, + "h": 22 + } + }, + { + "filename": "328_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 21, + "h": 21 + }, + "frame": { + "x": 21, + "y": 140, + "w": 21, + "h": 21 + } + }, { "filename": "330_2", "rotated": false, @@ -171,54 +297,12 @@ "h": 25 }, "frame": { - "x": 65, - "y": 29, + "x": 33, + "y": 58, "w": 29, "h": 25 } }, - { - "filename": "358_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 7, - "w": 17, - "h": 23 - }, - "frame": { - "x": 94, - "y": 29, - "w": 17, - "h": 23 - } - }, - { - "filename": "358_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 7, - "w": 17, - "h": 23 - }, - "frame": { - "x": 94, - "y": 52, - "w": 17, - "h": 23 - } - }, { "filename": "330_3", "rotated": false, @@ -234,12 +318,33 @@ "h": 25 }, "frame": { - "x": 65, - "y": 54, + "x": 32, + "y": 83, "w": 29, "h": 25 } }, + { + "filename": "286_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 2, + "w": 25, + "h": 27 + }, + "frame": { + "x": 62, + "y": 58, + "w": 25, + "h": 27 + } + }, { "filename": "303_1", "rotated": false, @@ -255,12 +360,54 @@ "h": 23 }, "frame": { - "x": 33, - "y": 55, + "x": 61, + "y": 85, "w": 28, "h": 23 } }, + { + "filename": "334-mega_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 4, + "w": 29, + "h": 25 + }, + "frame": { + "x": 32, + "y": 108, + "w": 29, + "h": 25 + } + }, + { + "filename": "334-mega_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 4, + "w": 29, + "h": 25 + }, + "frame": { + "x": 61, + "y": 108, + "w": 29, + "h": 25 + } + }, { "filename": "303_2", "rotated": false, @@ -276,8 +423,8 @@ "h": 23 }, "frame": { - "x": 0, - "y": 56, + "x": 42, + "y": 133, "w": 28, "h": 23 } @@ -297,14 +444,14 @@ "h": 23 }, "frame": { - "x": 111, - "y": 56, + "x": 70, + "y": 133, "w": 28, "h": 23 } }, { - "filename": "358_3", + "filename": "308_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -312,16 +459,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 7, - "w": 17, - "h": 23 + "x": 11, + "y": 2, + "w": 19, + "h": 27 }, "frame": { - "x": 94, - "y": 75, - "w": 17, - "h": 23 + "x": 71, + "y": 29, + "w": 19, + "h": 27 } }, { @@ -339,12 +486,54 @@ "h": 22 }, "frame": { - "x": 111, - "y": 79, + "x": 90, + "y": 28, "w": 27, "h": 22 } }, + { + "filename": "285_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 12, + "w": 20, + "h": 17 + }, + "frame": { + "x": 117, + "y": 28, + "w": 20, + "h": 17 + } + }, + { + "filename": "385_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 24, + "h": 22 + }, + "frame": { + "x": 137, + "y": 44, + "w": 24, + "h": 22 + } + }, { "filename": "329_3", "rotated": false, @@ -360,14 +549,14 @@ "h": 22 }, "frame": { - "x": 28, - "y": 78, + "x": 90, + "y": 50, "w": 27, "h": 22 } }, { - "filename": "264_2", + "filename": "308_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -375,58 +564,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 24, - "h": 22 + "x": 11, + "y": 2, + "w": 19, + "h": 27 }, "frame": { - "x": 0, - "y": 79, - "w": 24, - "h": 22 - } - }, - { - "filename": "264_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 24, - "h": 22 - }, - "frame": { - "x": 55, - "y": 79, - "w": 24, - "h": 22 - } - }, - { - "filename": "385_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 24, - "h": 22 - }, - "frame": { - "x": 24, - "y": 100, - "w": 24, - "h": 22 + "x": 117, + "y": 45, + "w": 19, + "h": 27 } }, { @@ -444,8 +591,8 @@ "h": 22 }, "frame": { - "x": 0, - "y": 101, + "x": 89, + "y": 72, "w": 24, "h": 22 } @@ -465,117 +612,12 @@ "h": 22 }, "frame": { - "x": 0, - "y": 123, + "x": 113, + "y": 72, "w": 24, "h": 22 } }, - { - "filename": "352_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 22, - "h": 22 - }, - "frame": { - "x": 24, - "y": 122, - "w": 22, - "h": 22 - } - }, - { - "filename": "352_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 22, - "h": 22 - }, - "frame": { - "x": 46, - "y": 122, - "w": 22, - "h": 22 - } - }, - { - "filename": "328_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 21, - "h": 21 - }, - "frame": { - "x": 48, - "y": 101, - "w": 21, - "h": 21 - } - }, - { - "filename": "352_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 22, - "h": 22 - }, - "frame": { - "x": 68, - "y": 122, - "w": 22, - "h": 22 - } - }, - { - "filename": "328_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 21, - "h": 21 - }, - "frame": { - "x": 90, - "y": 98, - "w": 21, - "h": 21 - } - }, { "filename": "263_2", "rotated": false, @@ -591,8 +633,8 @@ "h": 18 }, "frame": { - "x": 90, - "y": 119, + "x": 137, + "y": 66, "w": 24, "h": 18 } @@ -612,11 +654,179 @@ "h": 18 }, "frame": { - "x": 111, - "y": 101, + "x": 137, + "y": 84, "w": 24, "h": 18 } + }, + { + "filename": "352_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 22, + "h": 22 + }, + "frame": { + "x": 90, + "y": 94, + "w": 22, + "h": 22 + } + }, + { + "filename": "352_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 22, + "h": 22 + }, + "frame": { + "x": 112, + "y": 94, + "w": 22, + "h": 22 + } + }, + { + "filename": "352_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 22, + "h": 22 + }, + "frame": { + "x": 134, + "y": 102, + "w": 22, + "h": 22 + } + }, + { + "filename": "307_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 19, + "h": 22 + }, + "frame": { + "x": 98, + "y": 116, + "w": 19, + "h": 22 + } + }, + { + "filename": "358_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 7, + "w": 17, + "h": 23 + }, + "frame": { + "x": 98, + "y": 138, + "w": 17, + "h": 23 + } + }, + { + "filename": "358_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 7, + "w": 17, + "h": 23 + }, + "frame": { + "x": 117, + "y": 116, + "w": 17, + "h": 23 + } + }, + { + "filename": "307_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 19, + "h": 22 + }, + "frame": { + "x": 115, + "y": 139, + "w": 19, + "h": 22 + } + }, + { + "filename": "358_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 7, + "w": 17, + "h": 23 + }, + "frame": { + "x": 134, + "y": 124, + "w": 17, + "h": 23 + } } ] } @@ -624,6 +834,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:39b35377479a3c1e2e2a58a6d3f1ed79:8c66ec506d6de8111eb19d5a07d54fa1:039b026190bf1878996b3e03190bcdf3$" + "smartupdate": "$TexturePacker:SmartUpdate:594a431dc069cddadc7e214e22e28bc6:b5119c622c8ca58f57c57a0bb7bbc5b4:039b026190bf1878996b3e03190bcdf3$" } } diff --git a/public/images/pokemon_icons_3v.png b/public/images/pokemon_icons_3v.png index 512fce0ac..0f0c2df6e 100644 Binary files a/public/images/pokemon_icons_3v.png and b/public/images/pokemon_icons_3v.png differ diff --git a/public/images/pokemon_icons_4v.json b/public/images/pokemon_icons_4v.json index 6b7d7f010..a5c1484ef 100644 --- a/public/images/pokemon_icons_4v.json +++ b/public/images/pokemon_icons_4v.json @@ -4,8 +4,8 @@ "image": "pokemon_icons_4v.png", "format": "RGBA8888", "size": { - "w": 152, - "h": 152 + "w": 177, + "h": 177 }, "scale": 1, "frames": [ @@ -45,8 +45,8 @@ "h": 26 }, "frame": { - "x": 32, - "y": 0, + "x": 0, + "y": 26, "w": 32, "h": 26 } @@ -66,7 +66,7 @@ "h": 26 }, "frame": { - "x": 64, + "x": 32, "y": 0, "w": 32, "h": 26 @@ -87,54 +87,12 @@ "h": 24 }, "frame": { - "x": 96, - "y": 0, + "x": 0, + "y": 52, "w": 31, "h": 24 } }, - { - "filename": "444_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 25, - "h": 23 - }, - "frame": { - "x": 127, - "y": 0, - "w": 25, - "h": 23 - } - }, - { - "filename": "444_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 25, - "h": 23 - }, - "frame": { - "x": 127, - "y": 23, - "w": 25, - "h": 23 - } - }, { "filename": "445_2", "rotated": false, @@ -150,14 +108,14 @@ "h": 24 }, "frame": { - "x": 96, - "y": 24, + "x": 32, + "y": 26, "w": 31, "h": 24 } }, { - "filename": "444_3", + "filename": "445_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -166,225 +124,15 @@ }, "spriteSourceSize": { "x": 7, - "y": 6, - "w": 25, - "h": 23 + "y": 5, + "w": 31, + "h": 24 }, "frame": { - "x": 127, - "y": 46, - "w": 25, - "h": 23 - } - }, - { - "filename": "429_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 21, - "h": 29 - }, - "frame": { - "x": 0, - "y": 69, - "w": 21, - "h": 29 - } - }, - { - "filename": "468_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 30, - "h": 21 - }, - "frame": { - "x": 0, - "y": 48, - "w": 30, - "h": 21 - } - }, - { - "filename": "468_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 30, - "h": 21 - }, - "frame": { - "x": 0, - "y": 26, - "w": 30, - "h": 21 - } - }, - { - "filename": "429_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 21, - "h": 29 - }, - "frame": { - "x": 0, - "y": 98, - "w": 21, - "h": 29 - } - }, - { - "filename": "471_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 29, - "h": 25 - }, - "frame": { - "x": 0, - "y": 127, - "w": 29, - "h": 25 - } - }, - { - "filename": "429_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 21, - "h": 29 - }, - "frame": { - "x": 21, - "y": 69, - "w": 21, - "h": 29 - } - }, - { - "filename": "468_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 30, - "h": 21 - }, - "frame": { - "x": 30, - "y": 48, - "w": 30, - "h": 21 - } - }, - { - "filename": "433_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 25, - "h": 21 - }, - "frame": { - "x": 30, - "y": 26, - "w": 25, - "h": 21 - } - }, - { - "filename": "433_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 25, - "h": 21 - }, - "frame": { - "x": 55, - "y": 26, - "w": 25, - "h": 21 - } - }, - { - "filename": "440_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 16, - "h": 21 - }, - "frame": { - "x": 80, - "y": 26, - "w": 16, - "h": 21 + "x": 64, + "y": 0, + "w": 31, + "h": 24 } }, { @@ -402,8 +150,8 @@ "h": 28 }, "frame": { - "x": 21, - "y": 98, + "x": 0, + "y": 76, "w": 27, "h": 28 } @@ -423,14 +171,14 @@ "h": 28 }, "frame": { - "x": 42, - "y": 69, + "x": 0, + "y": 104, "w": 27, "h": 28 } }, { - "filename": "433_3", + "filename": "471_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -438,16 +186,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 25, - "h": 21 + "x": 5, + "y": 4, + "w": 29, + "h": 25 }, "frame": { - "x": 60, - "y": 48, - "w": 25, - "h": 21 + "x": 95, + "y": 0, + "w": 29, + "h": 25 } }, { @@ -465,12 +213,33 @@ "h": 25 }, "frame": { - "x": 29, - "y": 126, + "x": 124, + "y": 0, "w": 29, "h": 25 } }, + { + "filename": "400_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 24, + "h": 24 + }, + "frame": { + "x": 153, + "y": 0, + "w": 24, + "h": 24 + } + }, { "filename": "471_3", "rotated": false, @@ -486,14 +255,77 @@ "h": 25 }, "frame": { - "x": 48, - "y": 97, + "x": 0, + "y": 132, "w": 29, "h": 25 } }, { - "filename": "445_3", + "filename": "400_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 24, + "h": 24 + }, + "frame": { + "x": 153, + "y": 24, + "w": 24, + "h": 24 + } + }, + { + "filename": "489_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 10, + "w": 25, + "h": 19 + }, + "frame": { + "x": 0, + "y": 157, + "w": 25, + "h": 19 + } + }, + { + "filename": "429_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 1, + "w": 21, + "h": 29 + }, + "frame": { + "x": 27, + "y": 76, + "w": 21, + "h": 29 + } + }, + { + "filename": "470_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -503,16 +335,457 @@ "spriteSourceSize": { "x": 7, "y": 5, - "w": 31, + "w": 27, "h": 24 }, "frame": { - "x": 69, - "y": 69, - "w": 31, + "x": 27, + "y": 105, + "w": 27, "h": 24 } }, + { + "filename": "429_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 1, + "w": 21, + "h": 29 + }, + "frame": { + "x": 29, + "y": 129, + "w": 21, + "h": 29 + } + }, + { + "filename": "489_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 10, + "w": 25, + "h": 19 + }, + "frame": { + "x": 25, + "y": 158, + "w": 25, + "h": 19 + } + }, + { + "filename": "470_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 27, + "h": 24 + }, + "frame": { + "x": 31, + "y": 52, + "w": 27, + "h": 24 + } + }, + { + "filename": "429_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 1, + "w": 21, + "h": 29 + }, + "frame": { + "x": 48, + "y": 76, + "w": 21, + "h": 29 + } + }, + { + "filename": "470_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 27, + "h": 24 + }, + "frame": { + "x": 54, + "y": 105, + "w": 27, + "h": 24 + } + }, + { + "filename": "468_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 30, + "h": 21 + }, + "frame": { + "x": 50, + "y": 129, + "w": 30, + "h": 21 + } + }, + { + "filename": "468_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 30, + "h": 21 + }, + "frame": { + "x": 50, + "y": 150, + "w": 30, + "h": 21 + } + }, + { + "filename": "468_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 30, + "h": 21 + }, + "frame": { + "x": 64, + "y": 24, + "w": 30, + "h": 21 + } + }, + { + "filename": "433_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 25, + "h": 21 + }, + "frame": { + "x": 94, + "y": 25, + "w": 25, + "h": 21 + } + }, + { + "filename": "433_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 25, + "h": 21 + }, + "frame": { + "x": 119, + "y": 25, + "w": 25, + "h": 21 + } + }, + { + "filename": "433_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 25, + "h": 21 + }, + "frame": { + "x": 63, + "y": 45, + "w": 25, + "h": 21 + } + }, + { + "filename": "444_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 25, + "h": 23 + }, + "frame": { + "x": 88, + "y": 46, + "w": 25, + "h": 23 + } + }, + { + "filename": "444_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 25, + "h": 23 + }, + "frame": { + "x": 113, + "y": 46, + "w": 25, + "h": 23 + } + }, + { + "filename": "444_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 25, + "h": 23 + }, + "frame": { + "x": 138, + "y": 48, + "w": 25, + "h": 23 + } + }, + { + "filename": "440_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 8, + "w": 16, + "h": 21 + }, + "frame": { + "x": 69, + "y": 66, + "w": 16, + "h": 21 + } + }, + { + "filename": "399_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 11, + "w": 22, + "h": 18 + }, + "frame": { + "x": 69, + "y": 87, + "w": 22, + "h": 18 + } + }, + { + "filename": "399_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 11, + "w": 22, + "h": 18 + }, + "frame": { + "x": 85, + "y": 69, + "w": 22, + "h": 18 + } + }, + { + "filename": "489_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 10, + "w": 25, + "h": 19 + }, + "frame": { + "x": 107, + "y": 69, + "w": 25, + "h": 19 + } + }, + { + "filename": "440_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 8, + "w": 16, + "h": 21 + }, + "frame": { + "x": 91, + "y": 87, + "w": 16, + "h": 21 + } + }, + { + "filename": "490_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 24, + "h": 22 + }, + "frame": { + "x": 107, + "y": 88, + "w": 24, + "h": 22 + } + }, + { + "filename": "490_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 24, + "h": 22 + }, + "frame": { + "x": 132, + "y": 71, + "w": 24, + "h": 22 + } + }, { "filename": "443_1", "rotated": false, @@ -528,8 +801,8 @@ "h": 21 }, "frame": { - "x": 85, - "y": 48, + "x": 156, + "y": 71, "w": 21, "h": 21 } @@ -549,14 +822,14 @@ "h": 21 }, "frame": { - "x": 106, - "y": 48, + "x": 156, + "y": 92, "w": 21, "h": 21 } }, { - "filename": "470_1", + "filename": "490_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -564,41 +837,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 27, - "h": 24 + "x": 10, + "y": 7, + "w": 24, + "h": 22 }, "frame": { - "x": 58, - "y": 122, - "w": 27, - "h": 24 - } - }, - { - "filename": "470_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 27, - "h": 24 - }, - "frame": { - "x": 77, + "x": 131, "y": 93, - "w": 27, - "h": 24 + "w": 24, + "h": 22 } }, { - "filename": "470_3", + "filename": "442_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -606,15 +858,78 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, + "x": 8, + "y": 7, + "w": 23, + "h": 22 + }, + "frame": { + "x": 81, + "y": 108, + "w": 23, + "h": 22 + } + }, + { + "filename": "492-sky_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, "y": 5, - "w": 27, + "w": 23, "h": 24 }, "frame": { - "x": 100, - "y": 69, - "w": 27, + "x": 80, + "y": 130, + "w": 23, + "h": 24 + } + }, + { + "filename": "442_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 23, + "h": 22 + }, + "frame": { + "x": 104, + "y": 110, + "w": 23, + "h": 22 + } + }, + { + "filename": "492-sky_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 23, + "h": 24 + }, + "frame": { + "x": 103, + "y": 132, + "w": 23, "h": 24 } }, @@ -633,75 +948,12 @@ "h": 21 }, "frame": { - "x": 127, - "y": 69, + "x": 80, + "y": 154, "w": 21, "h": 21 } }, - { - "filename": "494_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 20, - "h": 24 - }, - "frame": { - "x": 127, - "y": 90, - "w": 20, - "h": 24 - } - }, - { - "filename": "494_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 20, - "h": 24 - }, - "frame": { - "x": 104, - "y": 93, - "w": 20, - "h": 24 - } - }, - { - "filename": "440_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 16, - "h": 21 - }, - "frame": { - "x": 124, - "y": 114, - "w": 16, - "h": 21 - } - }, { "filename": "440_3", "rotated": false, @@ -717,11 +969,95 @@ "h": 21 }, "frame": { - "x": 85, - "y": 117, + "x": 101, + "y": 156, "w": 16, "h": 21 } + }, + { + "filename": "492-land_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 11, + "w": 20, + "h": 18 + }, + "frame": { + "x": 127, + "y": 115, + "w": 20, + "h": 18 + } + }, + { + "filename": "494_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 20, + "h": 24 + }, + "frame": { + "x": 126, + "y": 133, + "w": 20, + "h": 24 + } + }, + { + "filename": "492-land_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 11, + "w": 20, + "h": 18 + }, + "frame": { + "x": 117, + "y": 157, + "w": 20, + "h": 18 + } + }, + { + "filename": "494_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 20, + "h": 24 + }, + "frame": { + "x": 147, + "y": 115, + "w": 20, + "h": 24 + } } ] } @@ -729,6 +1065,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:913f758e0aeeb8d20e993c73b55abbbe:816ed2c5affcecc79c4d6d9b360f8e7e:ebc3f8ec5b2480b298192d752b6e57dc$" + "smartupdate": "$TexturePacker:SmartUpdate:ce3f5e8c14252ac9da454c6a910b105a:7e9cb9b53a31a8f771455339797df39c:ebc3f8ec5b2480b298192d752b6e57dc$" } } diff --git a/public/images/pokemon_icons_4v.png b/public/images/pokemon_icons_4v.png index 5127750b2..c39e20b30 100644 Binary files a/public/images/pokemon_icons_4v.png and b/public/images/pokemon_icons_4v.png differ diff --git a/public/images/pokemon_icons_5v.json b/public/images/pokemon_icons_5v.json index b955f9eee..5efd5d232 100644 --- a/public/images/pokemon_icons_5v.json +++ b/public/images/pokemon_icons_5v.json @@ -4,578 +4,11 @@ "image": "pokemon_icons_5v.png", "format": "RGBA8888", "size": { - "w": 144, - "h": 144 + "w": 168, + "h": 168 }, "scale": 1, "frames": [ - { - "filename": "642-incarnate_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 33, - "h": 29 - }, - "frame": { - "x": 0, - "y": 0, - "w": 33, - "h": 29 - } - }, - { - "filename": "642-therian_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 34, - "h": 28 - }, - "frame": { - "x": 33, - "y": 0, - "w": 34, - "h": 28 - } - }, - { - "filename": "641-therian_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 32, - "h": 29 - }, - "frame": { - "x": 67, - "y": 0, - "w": 32, - "h": 29 - } - }, - { - "filename": "645-incarnate_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 33, - "h": 28 - }, - "frame": { - "x": 33, - "y": 28, - "w": 33, - "h": 28 - } - }, - { - "filename": "641-incarnate_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 32, - "h": 28 - }, - "frame": { - "x": 0, - "y": 29, - "w": 32, - "h": 28 - } - }, - { - "filename": "645-therian_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 29, - "h": 29 - }, - "frame": { - "x": 99, - "y": 0, - "w": 29, - "h": 29 - } - }, - { - "filename": "548_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 9, - "w": 14, - "h": 20 - }, - "frame": { - "x": 128, - "y": 0, - "w": 14, - "h": 20 - } - }, - { - "filename": "548_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 9, - "w": 14, - "h": 20 - }, - "frame": { - "x": 128, - "y": 20, - "w": 14, - "h": 20 - } - }, - { - "filename": "571_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 31, - "h": 24 - }, - "frame": { - "x": 66, - "y": 29, - "w": 31, - "h": 24 - } - }, - { - "filename": "571_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 31, - "h": 24 - }, - "frame": { - "x": 97, - "y": 29, - "w": 31, - "h": 24 - } - }, - { - "filename": "548_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 9, - "w": 14, - "h": 20 - }, - "frame": { - "x": 128, - "y": 40, - "w": 14, - "h": 20 - } - }, - { - "filename": "579_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 6, - "w": 32, - "h": 23 - }, - "frame": { - "x": 66, - "y": 53, - "w": 32, - "h": 23 - } - }, - { - "filename": "547_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 23, - "h": 24 - }, - "frame": { - "x": 98, - "y": 53, - "w": 23, - "h": 24 - } - }, - { - "filename": "547_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 23, - "h": 24 - }, - "frame": { - "x": 121, - "y": 60, - "w": 23, - "h": 24 - } - }, - { - "filename": "579_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 6, - "w": 32, - "h": 23 - }, - "frame": { - "x": 32, - "y": 56, - "w": 32, - "h": 23 - } - }, - { - "filename": "579_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 6, - "w": 32, - "h": 23 - }, - "frame": { - "x": 64, - "y": 76, - "w": 32, - "h": 23 - } - }, - { - "filename": "560_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 22, - "h": 23 - }, - "frame": { - "x": 96, - "y": 77, - "w": 22, - "h": 23 - } - }, - { - "filename": "560_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 22, - "h": 23 - }, - "frame": { - "x": 118, - "y": 84, - "w": 22, - "h": 23 - } - }, - { - "filename": "560_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 22, - "h": 23 - }, - "frame": { - "x": 0, - "y": 57, - "w": 22, - "h": 23 - } - }, - { - "filename": "572_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 24, - "h": 21 - }, - "frame": { - "x": 22, - "y": 79, - "w": 24, - "h": 21 - } - }, - { - "filename": "578_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 18, - "h": 21 - }, - "frame": { - "x": 46, - "y": 79, - "w": 18, - "h": 21 - } - }, - { - "filename": "572_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 24, - "h": 21 - }, - "frame": { - "x": 64, - "y": 99, - "w": 24, - "h": 21 - } - }, - { - "filename": "549_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 23 - }, - "frame": { - "x": 88, - "y": 100, - "w": 19, - "h": 23 - } - }, - { - "filename": "549_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 23 - }, - "frame": { - "x": 107, - "y": 107, - "w": 19, - "h": 23 - } - }, - { - "filename": "578_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 18, - "h": 21 - }, - "frame": { - "x": 126, - "y": 107, - "w": 18, - "h": 21 - } - }, - { - "filename": "577_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 13, - "w": 17, - "h": 16 - }, - "frame": { - "x": 126, - "y": 128, - "w": 17, - "h": 16 - } - }, - { - "filename": "578_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 18, - "h": 21 - }, - "frame": { - "x": 0, - "y": 80, - "w": 18, - "h": 21 - } - }, { "filename": "546_2", "rotated": false, @@ -591,33 +24,12 @@ "h": 16 }, "frame": { - "x": 18, - "y": 100, + "x": 0, + "y": 0, "w": 23, "h": 16 } }, - { - "filename": "570_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 10, - "w": 18, - "h": 19 - }, - "frame": { - "x": 0, - "y": 101, - "w": 18, - "h": 19 - } - }, { "filename": "546_3", "rotated": false, @@ -633,35 +45,14 @@ "h": 16 }, "frame": { - "x": 41, - "y": 100, + "x": 23, + "y": 0, "w": 23, "h": 16 } }, { - "filename": "570_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 10, - "w": 18, - "h": 19 - }, - "frame": { - "x": 18, - "y": 116, - "w": 18, - "h": 19 - } - }, - { - "filename": "559_1", + "filename": "577_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -670,57 +61,15 @@ }, "spriteSourceSize": { "x": 12, - "y": 11, + "y": 13, "w": 17, - "h": 18 + "h": 16 }, "frame": { - "x": 0, - "y": 120, + "x": 46, + "y": 0, "w": 17, - "h": 18 - } - }, - { - "filename": "559_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 11, - "w": 17, - "h": 18 - }, - "frame": { - "x": 36, - "y": 116, - "w": 17, - "h": 18 - } - }, - { - "filename": "559_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 11, - "w": 17, - "h": 18 - }, - "frame": { - "x": 53, - "y": 120, - "w": 17, - "h": 18 + "h": 16 } }, { @@ -738,8 +87,8 @@ "h": 16 }, "frame": { - "x": 70, - "y": 120, + "x": 63, + "y": 0, "w": 17, "h": 16 } @@ -759,11 +108,893 @@ "h": 16 }, "frame": { - "x": 87, - "y": 123, + "x": 80, + "y": 0, "w": 17, "h": 16 } + }, + { + "filename": "541_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 11, + "w": 22, + "h": 18 + }, + "frame": { + "x": 97, + "y": 0, + "w": 22, + "h": 18 + } + }, + { + "filename": "559_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 11, + "w": 17, + "h": 18 + }, + "frame": { + "x": 119, + "y": 0, + "w": 17, + "h": 18 + } + }, + { + "filename": "559_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 11, + "w": 17, + "h": 18 + }, + "frame": { + "x": 136, + "y": 0, + "w": 17, + "h": 18 + } + }, + { + "filename": "548_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 9, + "w": 14, + "h": 20 + }, + "frame": { + "x": 153, + "y": 0, + "w": 14, + "h": 20 + } + }, + { + "filename": "559_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 11, + "w": 17, + "h": 18 + }, + "frame": { + "x": 0, + "y": 16, + "w": 17, + "h": 18 + } + }, + { + "filename": "540_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 10, + "w": 17, + "h": 19 + }, + "frame": { + "x": 17, + "y": 16, + "w": 17, + "h": 19 + } + }, + { + "filename": "570_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 10, + "w": 18, + "h": 19 + }, + "frame": { + "x": 34, + "y": 16, + "w": 18, + "h": 19 + } + }, + { + "filename": "570_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 10, + "w": 18, + "h": 19 + }, + "frame": { + "x": 52, + "y": 16, + "w": 18, + "h": 19 + } + }, + { + "filename": "548_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 9, + "w": 14, + "h": 20 + }, + "frame": { + "x": 70, + "y": 16, + "w": 14, + "h": 20 + } + }, + { + "filename": "548_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 9, + "w": 14, + "h": 20 + }, + "frame": { + "x": 84, + "y": 18, + "w": 14, + "h": 20 + } + }, + { + "filename": "532_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 8, + "w": 26, + "h": 21 + }, + "frame": { + "x": 98, + "y": 18, + "w": 26, + "h": 21 + } + }, + { + "filename": "532_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 8, + "w": 26, + "h": 21 + }, + "frame": { + "x": 124, + "y": 18, + "w": 26, + "h": 21 + } + }, + { + "filename": "578_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 18, + "h": 21 + }, + "frame": { + "x": 150, + "y": 20, + "w": 18, + "h": 21 + } + }, + { + "filename": "572_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 8, + "w": 24, + "h": 21 + }, + "frame": { + "x": 0, + "y": 35, + "w": 24, + "h": 21 + } + }, + { + "filename": "572_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 8, + "w": 24, + "h": 21 + }, + "frame": { + "x": 24, + "y": 35, + "w": 24, + "h": 21 + } + }, + { + "filename": "578_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 18, + "h": 21 + }, + "frame": { + "x": 48, + "y": 35, + "w": 18, + "h": 21 + } + }, + { + "filename": "578_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 18, + "h": 21 + }, + "frame": { + "x": 66, + "y": 36, + "w": 18, + "h": 21 + } + }, + { + "filename": "538_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 7, + "w": 30, + "h": 22 + }, + "frame": { + "x": 84, + "y": 39, + "w": 30, + "h": 22 + } + }, + { + "filename": "538_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 7, + "w": 30, + "h": 22 + }, + "frame": { + "x": 114, + "y": 39, + "w": 30, + "h": 22 + } + }, + { + "filename": "542_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 6, + "w": 16, + "h": 23 + }, + "frame": { + "x": 144, + "y": 41, + "w": 16, + "h": 23 + } + }, + { + "filename": "549_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 19, + "h": 23 + }, + "frame": { + "x": 0, + "y": 56, + "w": 19, + "h": 23 + } + }, + { + "filename": "549_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 19, + "h": 23 + }, + "frame": { + "x": 19, + "y": 56, + "w": 19, + "h": 23 + } + }, + { + "filename": "560_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 6, + "w": 22, + "h": 23 + }, + "frame": { + "x": 38, + "y": 56, + "w": 22, + "h": 23 + } + }, + { + "filename": "560_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 6, + "w": 22, + "h": 23 + }, + "frame": { + "x": 60, + "y": 57, + "w": 22, + "h": 23 + } + }, + { + "filename": "560_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 6, + "w": 22, + "h": 23 + }, + "frame": { + "x": 82, + "y": 61, + "w": 22, + "h": 23 + } + }, + { + "filename": "579_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 6, + "w": 32, + "h": 23 + }, + "frame": { + "x": 104, + "y": 61, + "w": 32, + "h": 23 + } + }, + { + "filename": "579_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 6, + "w": 32, + "h": 23 + }, + "frame": { + "x": 136, + "y": 64, + "w": 32, + "h": 23 + } + }, + { + "filename": "579_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 6, + "w": 32, + "h": 23 + }, + "frame": { + "x": 0, + "y": 79, + "w": 32, + "h": 23 + } + }, + { + "filename": "547_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 23, + "h": 24 + }, + "frame": { + "x": 32, + "y": 79, + "w": 23, + "h": 24 + } + }, + { + "filename": "547_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 23, + "h": 24 + }, + "frame": { + "x": 55, + "y": 80, + "w": 23, + "h": 24 + } + }, + { + "filename": "571_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 31, + "h": 24 + }, + "frame": { + "x": 78, + "y": 84, + "w": 31, + "h": 24 + } + }, + { + "filename": "571_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 31, + "h": 24 + }, + "frame": { + "x": 109, + "y": 87, + "w": 31, + "h": 24 + } + }, + { + "filename": "533_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 29, + "h": 26 + }, + "frame": { + "x": 0, + "y": 102, + "w": 29, + "h": 26 + } + }, + { + "filename": "533_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 29, + "h": 26 + }, + "frame": { + "x": 29, + "y": 104, + "w": 29, + "h": 26 + } + }, + { + "filename": "534_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 3, + "y": 4, + "w": 33, + "h": 26 + }, + "frame": { + "x": 58, + "y": 108, + "w": 33, + "h": 26 + } + }, + { + "filename": "534_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 3, + "y": 4, + "w": 33, + "h": 26 + }, + "frame": { + "x": 91, + "y": 111, + "w": 33, + "h": 26 + } + }, + { + "filename": "641-incarnate_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 1, + "w": 32, + "h": 28 + }, + "frame": { + "x": 124, + "y": 111, + "w": 32, + "h": 28 + } + }, + { + "filename": "645-therian_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 0, + "w": 29, + "h": 29 + }, + "frame": { + "x": 0, + "y": 128, + "w": 29, + "h": 29 + } + }, + { + "filename": "642-therian_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 3, + "y": 2, + "w": 34, + "h": 28 + }, + "frame": { + "x": 29, + "y": 134, + "w": 34, + "h": 28 + } + }, + { + "filename": "645-incarnate_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 3, + "y": 1, + "w": 33, + "h": 28 + }, + "frame": { + "x": 63, + "y": 137, + "w": 33, + "h": 28 + } + }, + { + "filename": "641-therian_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 32, + "h": 29 + }, + "frame": { + "x": 96, + "y": 139, + "w": 32, + "h": 29 + } + }, + { + "filename": "642-incarnate_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 3, + "y": 0, + "w": 33, + "h": 29 + }, + "frame": { + "x": 128, + "y": 139, + "w": 33, + "h": 29 + } } ] } @@ -771,6 +1002,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:56e6c204dd5c749bf3bdc43b0f001c38:5c4fe6cd53fa83d4764d3fbd8090402b:f1931bc28ee7f32dba7543723757cf2a$" + "smartupdate": "$TexturePacker:SmartUpdate:ec0e8332edc388e94c276b91e9aa14dc:af33dc29f0ba47be720e7a1d441f0438:f1931bc28ee7f32dba7543723757cf2a$" } } diff --git a/public/images/pokemon_icons_5v.png b/public/images/pokemon_icons_5v.png index 8c48d70bc..c508c1f8f 100644 Binary files a/public/images/pokemon_icons_5v.png and b/public/images/pokemon_icons_5v.png differ diff --git a/public/images/pokemon_icons_6v.json b/public/images/pokemon_icons_6v.json index 18123eaf9..e3864b278 100644 --- a/public/images/pokemon_icons_6v.json +++ b/public/images/pokemon_icons_6v.json @@ -4,11 +4,74 @@ "image": "pokemon_icons_6v.png", "format": "RGBA8888", "size": { - "w": 98, - "h": 98 + "w": 125, + "h": 125 }, "scale": 1, "frames": [ + { + "filename": "720-unbound_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 0, + "y": 1, + "w": 40, + "h": 29 + }, + "frame": { + "x": 0, + "y": 0, + "w": 40, + "h": 29 + } + }, + { + "filename": "720-unbound_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 0, + "y": 1, + "w": 40, + "h": 29 + }, + "frame": { + "x": 40, + "y": 0, + "w": 40, + "h": 29 + } + }, + { + "filename": "720-unbound_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 0, + "y": 1, + "w": 40, + "h": 29 + }, + "frame": { + "x": 80, + "y": 0, + "w": 40, + "h": 29 + } + }, { "filename": "709_2", "rotated": false, @@ -25,7 +88,7 @@ }, "frame": { "x": 0, - "y": 0, + "y": 29, "w": 27, "h": 27 } @@ -46,7 +109,7 @@ }, "frame": { "x": 0, - "y": 27, + "y": 56, "w": 27, "h": 27 } @@ -65,139 +128,13 @@ "w": 26, "h": 26 }, - "frame": { - "x": 27, - "y": 0, - "w": 26, - "h": 26 - } - }, - { - "filename": "706_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 26, - "h": 26 - }, "frame": { "x": 0, - "y": 54, + "y": 83, "w": 26, "h": 26 } }, - { - "filename": "708_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 27, - "h": 23 - }, - "frame": { - "x": 53, - "y": 0, - "w": 27, - "h": 23 - } - }, - { - "filename": "700_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 24, - "h": 25 - }, - "frame": { - "x": 27, - "y": 26, - "w": 24, - "h": 25 - } - }, - { - "filename": "705_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 5, - "w": 17, - "h": 24 - }, - "frame": { - "x": 80, - "y": 0, - "w": 17, - "h": 24 - } - }, - { - "filename": "708_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 27, - "h": 23 - }, - "frame": { - "x": 53, - "y": 23, - "w": 27, - "h": 23 - } - }, - { - "filename": "705_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 5, - "w": 17, - "h": 24 - }, - "frame": { - "x": 80, - "y": 24, - "w": 17, - "h": 24 - } - }, { "filename": "704_2", "rotated": false, @@ -214,7 +151,7 @@ }, "frame": { "x": 0, - "y": 80, + "y": 109, "w": 14, "h": 16 } @@ -235,11 +172,95 @@ }, "frame": { "x": 14, - "y": 80, + "y": 109, "w": 14, "h": 16 } }, + { + "filename": "706_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 26, + "h": 26 + }, + "frame": { + "x": 26, + "y": 83, + "w": 26, + "h": 26 + } + }, + { + "filename": "708_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 27, + "h": 23 + }, + "frame": { + "x": 27, + "y": 29, + "w": 27, + "h": 23 + } + }, + { + "filename": "708_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 27, + "h": 23 + }, + "frame": { + "x": 27, + "y": 52, + "w": 27, + "h": 23 + } + }, + { + "filename": "700_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 24, + "h": 25 + }, + "frame": { + "x": 52, + "y": 75, + "w": 24, + "h": 25 + } + }, { "filename": "700_3", "rotated": false, @@ -255,8 +276,8 @@ "h": 25 }, "frame": { - "x": 51, - "y": 46, + "x": 52, + "y": 100, "w": 24, "h": 25 } @@ -276,12 +297,33 @@ "h": 25 }, "frame": { - "x": 75, - "y": 48, + "x": 54, + "y": 29, "w": 23, "h": 25 } }, + { + "filename": "720_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 23, + "h": 21 + }, + "frame": { + "x": 54, + "y": 54, + "w": 23, + "h": 21 + } + }, { "filename": "711_2", "rotated": false, @@ -297,33 +339,12 @@ "h": 25 }, "frame": { - "x": 28, - "y": 51, + "x": 76, + "y": 75, "w": 23, "h": 25 } }, - { - "filename": "710_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 19, - "h": 21 - }, - "frame": { - "x": 28, - "y": 76, - "w": 19, - "h": 21 - } - }, { "filename": "711_3", "rotated": false, @@ -339,12 +360,117 @@ "h": 25 }, "frame": { - "x": 51, - "y": 71, + "x": 76, + "y": 100, "w": 23, "h": 25 } }, + { + "filename": "720_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 23, + "h": 21 + }, + "frame": { + "x": 77, + "y": 29, + "w": 23, + "h": 21 + } + }, + { + "filename": "720_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 23, + "h": 21 + }, + "frame": { + "x": 77, + "y": 50, + "w": 23, + "h": 21 + } + }, + { + "filename": "705_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 5, + "w": 17, + "h": 24 + }, + "frame": { + "x": 99, + "y": 71, + "w": 17, + "h": 24 + } + }, + { + "filename": "705_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 5, + "w": 17, + "h": 24 + }, + "frame": { + "x": 99, + "y": 95, + "w": 17, + "h": 24 + } + }, + { + "filename": "710_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 19, + "h": 21 + }, + "frame": { + "x": 100, + "y": 29, + "w": 19, + "h": 21 + } + }, { "filename": "710_3", "rotated": false, @@ -360,8 +486,8 @@ "h": 21 }, "frame": { - "x": 74, - "y": 73, + "x": 100, + "y": 50, "w": 19, "h": 21 } @@ -372,6 +498,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:b682406f79e7df984a96ddb5f1a9dfc7:0621da2b4f2764ccfa8f63d5fdbeaf91:8a74f769af240f74b0e67390bbb36c14$" + "smartupdate": "$TexturePacker:SmartUpdate:999b7376d933d9650355ce494f278fd8:44fb34b97cbbfaec552d571bc55632c5:8a74f769af240f74b0e67390bbb36c14$" } } diff --git a/public/images/pokemon_icons_6v.png b/public/images/pokemon_icons_6v.png index efcdeb873..9f5cf714b 100644 Binary files a/public/images/pokemon_icons_6v.png and b/public/images/pokemon_icons_6v.png differ diff --git a/public/images/pokemon_icons_7v.json b/public/images/pokemon_icons_7v.json index 3b9e62732..98dd0ccae 100644 --- a/public/images/pokemon_icons_7v.json +++ b/public/images/pokemon_icons_7v.json @@ -4,11 +4,95 @@ "image": "pokemon_icons_7v.png", "format": "RGBA8888", "size": { - "w": 52, - "h": 52 + "w": 80, + "h": 80 }, "scale": 1, "frames": [ + { + "filename": "791_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 1, + "w": 31, + "h": 29 + }, + "frame": { + "x": 0, + "y": 0, + "w": 31, + "h": 29 + } + }, + { + "filename": "748_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 4, + "w": 28, + "h": 26 + }, + "frame": { + "x": 0, + "y": 29, + "w": 28, + "h": 26 + } + }, + { + "filename": "748_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 4, + "w": 28, + "h": 26 + }, + "frame": { + "x": 28, + "y": 29, + "w": 28, + "h": 26 + } + }, + { + "filename": "789_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 25, + "h": 22 + }, + "frame": { + "x": 31, + "y": 0, + "w": 25, + "h": 22 + } + }, { "filename": "802_1", "rotated": false, @@ -24,7 +108,7 @@ "h": 26 }, "frame": { - "x": 0, + "x": 56, "y": 0, "w": 24, "h": 26 @@ -45,7 +129,7 @@ "h": 26 }, "frame": { - "x": 0, + "x": 56, "y": 26, "w": 24, "h": 26 @@ -66,11 +150,53 @@ "h": 26 }, "frame": { - "x": 24, - "y": 0, + "x": 56, + "y": 52, "w": 24, "h": 26 } + }, + { + "filename": "747_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 6, + "w": 24, + "h": 22 + }, + "frame": { + "x": 0, + "y": 55, + "w": 24, + "h": 22 + } + }, + { + "filename": "747_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 6, + "w": 24, + "h": 22 + }, + "frame": { + "x": 24, + "y": 55, + "w": 24, + "h": 22 + } } ] } @@ -78,6 +204,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:74b91bf1eff78f89b5fb8a626034b38c:9d9fac3afebd058ddab2bf309dd3f74b:d5975df27e1e94206a68aa1fd3c2c8d0$" + "smartupdate": "$TexturePacker:SmartUpdate:f87860b9bcc6269cb0d1ea2b59a5c866:3b9a5f84cddb0349b5a9decea7728980:d5975df27e1e94206a68aa1fd3c2c8d0$" } } diff --git a/public/images/pokemon_icons_7v.png b/public/images/pokemon_icons_7v.png index 7b97a95ba..d6d4192cf 100644 Binary files a/public/images/pokemon_icons_7v.png and b/public/images/pokemon_icons_7v.png differ diff --git a/public/images/pokemon_icons_8v.json b/public/images/pokemon_icons_8v.json index 0fba7f90a..bac2cd5fe 100644 --- a/public/images/pokemon_icons_8v.json +++ b/public/images/pokemon_icons_8v.json @@ -4,11 +4,53 @@ "image": "pokemon_icons_8v.png", "format": "RGBA8888", "size": { - "w": 107, - "h": 107 + "w": 161, + "h": 161 }, "scale": 1, "frames": [ + { + "filename": "887_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 1, + "w": 32, + "h": 28 + }, + "frame": { + "x": 0, + "y": 0, + "w": 32, + "h": 28 + } + }, + { + "filename": "887_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 1, + "w": 32, + "h": 28 + }, + "frame": { + "x": 0, + "y": 28, + "w": 32, + "h": 28 + } + }, { "filename": "6706_2", "rotated": false, @@ -24,7 +66,7 @@ "h": 27 }, "frame": { - "x": 0, + "x": 32, "y": 0, "w": 28, "h": 27 @@ -46,8 +88,113 @@ }, "frame": { "x": 0, + "y": 56, + "w": 28, + "h": 27 + } + }, + { + "filename": "886_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 28, + "h": 26 + }, + "frame": { + "x": 32, "y": 27, "w": 28, + "h": 26 + } + }, + { + "filename": "886_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 28, + "h": 26 + }, + "frame": { + "x": 60, + "y": 0, + "w": 28, + "h": 26 + } + }, + { + "filename": "886_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 28, + "h": 26 + }, + "frame": { + "x": 0, + "y": 83, + "w": 28, + "h": 26 + } + }, + { + "filename": "900_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 27, + "h": 27 + }, + "frame": { + "x": 60, + "y": 26, + "w": 27, + "h": 27 + } + }, + { + "filename": "900_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 27, + "h": 27 + }, + "frame": { + "x": 0, + "y": 109, + "w": 27, "h": 27 } }, @@ -66,8 +213,8 @@ "h": 25 }, "frame": { - "x": 28, - "y": 0, + "x": 0, + "y": 136, "w": 27, "h": 25 } @@ -87,8 +234,8 @@ "h": 25 }, "frame": { - "x": 0, - "y": 54, + "x": 88, + "y": 0, "w": 27, "h": 25 } @@ -108,12 +255,54 @@ "h": 24 }, "frame": { - "x": 28, - "y": 25, + "x": 115, + "y": 0, "w": 27, "h": 24 } }, + { + "filename": "877-hangry_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 142, + "y": 0, + "w": 19, + "h": 23 + } + }, + { + "filename": "877-hangry_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 142, + "y": 23, + "w": 19, + "h": 23 + } + }, { "filename": "873_2", "rotated": false, @@ -129,8 +318,8 @@ "h": 24 }, "frame": { - "x": 55, - "y": 0, + "x": 115, + "y": 24, "w": 27, "h": 24 } @@ -150,14 +339,14 @@ "h": 24 }, "frame": { - "x": 0, - "y": 79, + "x": 88, + "y": 25, "w": 27, "h": 24 } }, { - "filename": "4264_2", + "filename": "877-hangry_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -165,20 +354,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 24, - "h": 22 + "x": 10, + "y": 3, + "w": 19, + "h": 23 }, "frame": { - "x": 55, - "y": 24, - "w": 24, - "h": 22 + "x": 142, + "y": 46, + "w": 19, + "h": 23 } }, { - "filename": "4264_3", + "filename": "858_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -187,145 +376,19 @@ }, "spriteSourceSize": { "x": 8, - "y": 4, + "y": 1, "w": 24, - "h": 22 - }, - "frame": { - "x": 82, - "y": 0, - "w": 24, - "h": 22 - } - }, - { - "filename": "4263_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 24, - "h": 18 + "h": 27 }, "frame": { "x": 28, - "y": 49, + "y": 56, "w": 24, - "h": 18 + "h": 27 } }, { - "filename": "6570_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 20, - "h": 24 - }, - "frame": { - "x": 27, - "y": 67, - "w": 20, - "h": 24 - } - }, - { - "filename": "872_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 19, - "h": 16 - }, - "frame": { - "x": 27, - "y": 91, - "w": 19, - "h": 16 - } - }, - { - "filename": "872_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 19, - "h": 16 - }, - "frame": { - "x": 46, - "y": 91, - "w": 19, - "h": 16 - } - }, - { - "filename": "6570_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 20, - "h": 24 - }, - "frame": { - "x": 47, - "y": 67, - "w": 20, - "h": 24 - } - }, - { - "filename": "872_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 19, - "h": 16 - }, - "frame": { - "x": 65, - "y": 91, - "w": 19, - "h": 16 - } - }, - { - "filename": "4263_3", + "filename": "858_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -334,19 +397,19 @@ }, "spriteSourceSize": { "x": 8, - "y": 6, + "y": 1, "w": 24, - "h": 18 + "h": 27 }, "frame": { - "x": 52, - "y": 49, + "x": 28, + "y": 83, "w": 24, - "h": 18 + "h": 27 } }, { - "filename": "6705_2", + "filename": "857_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -354,18 +417,81 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 5, - "w": 17, + "x": 8, + "y": 3, + "w": 24, "h": 24 }, "frame": { - "x": 67, - "y": 67, - "w": 17, + "x": 27, + "y": 110, + "w": 24, "h": 24 } }, + { + "filename": "857_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 24, + "h": 24 + }, + "frame": { + "x": 27, + "y": 134, + "w": 24, + "h": 24 + } + }, + { + "filename": "856_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 2, + "w": 21, + "h": 25 + }, + "frame": { + "x": 52, + "y": 53, + "w": 21, + "h": 25 + } + }, + { + "filename": "856_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 2, + "w": 21, + "h": 25 + }, + "frame": { + "x": 52, + "y": 78, + "w": 21, + "h": 25 + } + }, { "filename": "6549_2", "rotated": false, @@ -381,8 +507,8 @@ "h": 25 }, "frame": { - "x": 79, - "y": 24, + "x": 73, + "y": 53, "w": 18, "h": 25 } @@ -402,12 +528,201 @@ "h": 25 }, "frame": { - "x": 84, - "y": 49, + "x": 73, + "y": 78, "w": 18, "h": 25 } }, + { + "filename": "4264_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 24, + "h": 22 + }, + "frame": { + "x": 91, + "y": 49, + "w": 24, + "h": 22 + } + }, + { + "filename": "4264_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 24, + "h": 22 + }, + "frame": { + "x": 115, + "y": 48, + "w": 24, + "h": 22 + } + }, + { + "filename": "6570_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 20, + "h": 24 + }, + "frame": { + "x": 91, + "y": 71, + "w": 20, + "h": 24 + } + }, + { + "filename": "885_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 26, + "h": 19 + }, + "frame": { + "x": 52, + "y": 103, + "w": 26, + "h": 19 + } + }, + { + "filename": "885_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 26, + "h": 19 + }, + "frame": { + "x": 51, + "y": 122, + "w": 26, + "h": 19 + } + }, + { + "filename": "885_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 26, + "h": 19 + }, + "frame": { + "x": 51, + "y": 141, + "w": 26, + "h": 19 + } + }, + { + "filename": "877_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 78, + "y": 103, + "w": 19, + "h": 23 + } + }, + { + "filename": "6570_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 20, + "h": 24 + }, + "frame": { + "x": 77, + "y": 126, + "w": 20, + "h": 24 + } + }, + { + "filename": "6705_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 5, + "w": 17, + "h": 24 + }, + "frame": { + "x": 97, + "y": 95, + "w": 17, + "h": 24 + } + }, { "filename": "6705_3", "rotated": false, @@ -423,11 +738,158 @@ "h": 24 }, "frame": { - "x": 84, - "y": 74, + "x": 97, + "y": 119, "w": 17, "h": 24 } + }, + { + "filename": "4263_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 24, + "h": 18 + }, + "frame": { + "x": 97, + "y": 143, + "w": 24, + "h": 18 + } + }, + { + "filename": "877_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 111, + "y": 71, + "w": 19, + "h": 23 + } + }, + { + "filename": "877_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 114, + "y": 94, + "w": 19, + "h": 23 + } + }, + { + "filename": "4263_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 24, + "h": 18 + }, + "frame": { + "x": 114, + "y": 117, + "w": 24, + "h": 18 + } + }, + { + "filename": "872_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 19, + "h": 16 + }, + "frame": { + "x": 121, + "y": 135, + "w": 19, + "h": 16 + } + }, + { + "filename": "872_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 19, + "h": 16 + }, + "frame": { + "x": 130, + "y": 70, + "w": 19, + "h": 16 + } + }, + { + "filename": "872_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 19, + "h": 16 + }, + "frame": { + "x": 133, + "y": 86, + "w": 19, + "h": 16 + } } ] } @@ -435,6 +897,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:786c66f91b209fa43195adad625bba7a:d08bb87b741dd122687e4f140536121d:ec5f05e7f30cd98f74db0c2326109fd3$" + "smartupdate": "$TexturePacker:SmartUpdate:24c9149f93bc0780ddac7e68b7cdf2ee:a47e40f05fefa08be7ce6c997b27cd04:ec5f05e7f30cd98f74db0c2326109fd3$" } } diff --git a/public/images/pokemon_icons_8v.png b/public/images/pokemon_icons_8v.png index 1b8078b02..00731a0f0 100644 Binary files a/public/images/pokemon_icons_8v.png and b/public/images/pokemon_icons_8v.png differ diff --git a/public/images/pokemon_icons_9v.json b/public/images/pokemon_icons_9v.json index e67af84b2..0e3946165 100644 --- a/public/images/pokemon_icons_9v.json +++ b/public/images/pokemon_icons_9v.json @@ -323,6 +323,27 @@ "w": 17, "h": 28 } + }, + { + "filename": "967_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 22, + "h": 21 + }, + "frame": { + "x": 50, + "y": 84, + "w": 22, + "h": 21 + } } ] } @@ -330,6 +351,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:c6b17c9f254492406ec134473a5155e9:b921355fb3643fcb7efe6ff5df6d6df4:3ec5c0bc286c296cfb7fa30a8b06f3da$" + "smartupdate": "$TexturePacker:SmartUpdate:9683a313d5ac18db632fb677a38ed11c:8e6ba9eced08bb11299aadeb742c10ba:3ec5c0bc286c296cfb7fa30a8b06f3da$" } } diff --git a/public/images/pokemon_icons_9v.png b/public/images/pokemon_icons_9v.png index 9406958be..58b9b8b0c 100644 Binary files a/public/images/pokemon_icons_9v.png and b/public/images/pokemon_icons_9v.png differ