diff --git a/public/exp-sprites.json b/public/exp-sprites.json index 2595b5a7983..5580bb5cb7d 100644 --- a/public/exp-sprites.json +++ b/public/exp-sprites.json @@ -179,8 +179,6 @@ "483-origin", "484-origin", "484-origin", - "487-origin", - "487-origin", "531-mega", "531-mega", "569-gigantamax", @@ -1293,8 +1291,6 @@ "483b-origin", "484b-origin", "484b-origin", - "487b-origin", - "487b-origin", "531b-mega", "531b-mega", "569b-gigantamax", @@ -2407,8 +2403,6 @@ "483sb-origin", "484sb-origin", "484sb-origin", - "487sb-origin", - "487sb-origin", "531sb-mega", "531sb-mega", "569sb-gigantamax", @@ -3526,8 +3520,6 @@ "483s-origin", "484s-origin", "484s-origin", - "487s-origin", - "487s-origin", "531s-mega", "531s-mega", "569s-gigantamax", diff --git a/public/images/pokemon/exp/487-origin.json b/public/images/pokemon/exp/487-origin.json deleted file mode 100644 index a146f68d70d..00000000000 --- a/public/images/pokemon/exp/487-origin.json +++ /dev/null @@ -1,566 +0,0 @@ -{ - "textures": [ - { - "image": "487-origin.png", - "format": "RGBA8888", - "size": { - "w": 318, - "h": 318 - }, - "scale": 1, - "frames": [ - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 0, - "y": 8, - "w": 91, - "h": 77 - }, - "frame": { - "x": 0, - "y": 0, - "w": 91, - "h": 77 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 0, - "y": 8, - "w": 91, - "h": 77 - }, - "frame": { - "x": 0, - "y": 0, - "w": 91, - "h": 77 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 0, - "y": 9, - "w": 91, - "h": 74 - }, - "frame": { - "x": 91, - "y": 0, - "w": 91, - "h": 74 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 0, - "y": 10, - "w": 91, - "h": 74 - }, - "frame": { - "x": 91, - "y": 0, - "w": 91, - "h": 74 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 0, - "y": 10, - "w": 91, - "h": 74 - }, - "frame": { - "x": 91, - "y": 0, - "w": 91, - "h": 74 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 89, - "h": 75 - }, - "frame": { - "x": 182, - "y": 0, - "w": 89, - "h": 75 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 89, - "h": 75 - }, - "frame": { - "x": 182, - "y": 0, - "w": 89, - "h": 75 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 89, - "h": 75 - }, - "frame": { - "x": 182, - "y": 0, - "w": 89, - "h": 75 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 3, - "y": 7, - "w": 86, - "h": 79 - }, - "frame": { - "x": 91, - "y": 74, - "w": 86, - "h": 79 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 3, - "y": 8, - "w": 86, - "h": 79 - }, - "frame": { - "x": 91, - "y": 74, - "w": 86, - "h": 79 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 85, - "h": 83 - }, - "frame": { - "x": 0, - "y": 77, - "w": 85, - "h": 83 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 85, - "h": 83 - }, - "frame": { - "x": 0, - "y": 77, - "w": 85, - "h": 83 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 85, - "h": 82 - }, - "frame": { - "x": 177, - "y": 75, - "w": 85, - "h": 82 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 83, - "h": 83 - }, - "frame": { - "x": 85, - "y": 153, - "w": 83, - "h": 83 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 83, - "h": 83 - }, - "frame": { - "x": 85, - "y": 153, - "w": 83, - "h": 83 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 80, - "h": 82 - }, - "frame": { - "x": 0, - "y": 236, - "w": 80, - "h": 82 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 80, - "h": 82 - }, - "frame": { - "x": 0, - "y": 236, - "w": 80, - "h": 82 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 80, - "h": 82 - }, - "frame": { - "x": 0, - "y": 236, - "w": 80, - "h": 82 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 83, - "h": 76 - }, - "frame": { - "x": 0, - "y": 160, - "w": 83, - "h": 76 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 2, - "y": 5, - "w": 83, - "h": 76 - }, - "frame": { - "x": 0, - "y": 160, - "w": 83, - "h": 76 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 81, - "h": 81 - }, - "frame": { - "x": 80, - "y": 236, - "w": 81, - "h": 81 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 5, - "y": 7, - "w": 81, - "h": 80 - }, - "frame": { - "x": 161, - "y": 236, - "w": 81, - "h": 80 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 5, - "y": 7, - "w": 81, - "h": 80 - }, - "frame": { - "x": 161, - "y": 236, - "w": 81, - "h": 80 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 81, - "h": 79 - }, - "frame": { - "x": 168, - "y": 157, - "w": 81, - "h": 79 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 81, - "h": 79 - }, - "frame": { - "x": 168, - "y": 157, - "w": 81, - "h": 79 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 81, - "h": 79 - }, - "frame": { - "x": 168, - "y": 157, - "w": 81, - "h": 79 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:f669baef18fc6ae83124ad81c9b726f9:b705ee5bfe7dc7d92c348ffa4a4d6ce2:5d19509f6557fe13b0b6311434ba7e2d$" - } -} diff --git a/public/images/pokemon/exp/487-origin.png b/public/images/pokemon/exp/487-origin.png deleted file mode 100644 index 370ddf89173..00000000000 Binary files a/public/images/pokemon/exp/487-origin.png and /dev/null differ diff --git a/public/images/pokemon/exp/back/487-origin.json b/public/images/pokemon/exp/back/487-origin.json deleted file mode 100644 index 72f5e4d4dc4..00000000000 --- a/public/images/pokemon/exp/back/487-origin.json +++ /dev/null @@ -1,566 +0,0 @@ -{ - "textures": [ - { - "image": "487-origin.png", - "format": "RGBA8888", - "size": { - "w": 326, - "h": 326 - }, - "scale": 1, - "frames": [ - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 95, - "h": 84 - }, - "frame": { - "x": 0, - "y": 0, - "w": 95, - "h": 84 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 95, - "h": 84 - }, - "frame": { - "x": 0, - "y": 0, - "w": 95, - "h": 84 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 2, - "y": 7, - "w": 97, - "h": 79 - }, - "frame": { - "x": 0, - "y": 84, - "w": 97, - "h": 79 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 2, - "y": 7, - "w": 97, - "h": 79 - }, - "frame": { - "x": 0, - "y": 84, - "w": 97, - "h": 79 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 4, - "y": 6, - "w": 97, - "h": 78 - }, - "frame": { - "x": 95, - "y": 0, - "w": 97, - "h": 78 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 97, - "h": 78 - }, - "frame": { - "x": 95, - "y": 0, - "w": 97, - "h": 78 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 97, - "h": 78 - }, - "frame": { - "x": 95, - "y": 0, - "w": 97, - "h": 78 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 94, - "h": 84 - }, - "frame": { - "x": 97, - "y": 78, - "w": 94, - "h": 84 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 94, - "h": 84 - }, - "frame": { - "x": 97, - "y": 78, - "w": 94, - "h": 84 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 94, - "h": 84 - }, - "frame": { - "x": 97, - "y": 78, - "w": 94, - "h": 84 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 1, - "y": 6, - "w": 95, - "h": 81 - }, - "frame": { - "x": 97, - "y": 162, - "w": 95, - "h": 81 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 1, - "y": 7, - "w": 95, - "h": 81 - }, - "frame": { - "x": 97, - "y": 162, - "w": 95, - "h": 81 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 94, - "h": 84 - }, - "frame": { - "x": 191, - "y": 78, - "w": 94, - "h": 84 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 94, - "h": 84 - }, - "frame": { - "x": 191, - "y": 78, - "w": 94, - "h": 84 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 94, - "h": 77 - }, - "frame": { - "x": 192, - "y": 0, - "w": 94, - "h": 77 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 94, - "h": 77 - }, - "frame": { - "x": 192, - "y": 0, - "w": 94, - "h": 77 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 94, - "h": 77 - }, - "frame": { - "x": 192, - "y": 0, - "w": 94, - "h": 77 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 94, - "h": 83 - }, - "frame": { - "x": 0, - "y": 163, - "w": 94, - "h": 83 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 92, - "h": 83 - }, - "frame": { - "x": 192, - "y": 162, - "w": 92, - "h": 83 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 92, - "h": 82 - }, - "frame": { - "x": 94, - "y": 243, - "w": 92, - "h": 82 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 92, - "h": 82 - }, - "frame": { - "x": 94, - "y": 243, - "w": 92, - "h": 82 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 90, - "h": 78 - }, - "frame": { - "x": 0, - "y": 246, - "w": 90, - "h": 78 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 90, - "h": 78 - }, - "frame": { - "x": 0, - "y": 246, - "w": 90, - "h": 78 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 91, - "h": 81 - }, - "frame": { - "x": 186, - "y": 245, - "w": 91, - "h": 81 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 91, - "h": 81 - }, - "frame": { - "x": 186, - "y": 245, - "w": 91, - "h": 81 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 91, - "h": 81 - }, - "frame": { - "x": 186, - "y": 245, - "w": 91, - "h": 81 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:d1a63c2aac4c99e778e6efb9fa120e53:11f49886c328fc8474daefc2533a7f5d:5d19509f6557fe13b0b6311434ba7e2d$" - } -} diff --git a/public/images/pokemon/exp/back/487-origin.png b/public/images/pokemon/exp/back/487-origin.png deleted file mode 100644 index ec3dfd6c8f8..00000000000 Binary files a/public/images/pokemon/exp/back/487-origin.png and /dev/null differ diff --git a/public/images/pokemon/exp/back/shiny/487-origin.json b/public/images/pokemon/exp/back/shiny/487-origin.json deleted file mode 100644 index 8da21992405..00000000000 --- a/public/images/pokemon/exp/back/shiny/487-origin.json +++ /dev/null @@ -1,293 +0,0 @@ -{ - "textures": [ - { - "image": "487-origin.png", - "format": "RGBA8888", - "size": { - "w": 326, - "h": 326 - }, - "scale": 1, - "frames": [ - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 95, - "h": 84 - }, - "frame": { - "x": 0, - "y": 0, - "w": 95, - "h": 84 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 2, - "y": 7, - "w": 97, - "h": 79 - }, - "frame": { - "x": 0, - "y": 84, - "w": 97, - "h": 79 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 97, - "h": 78 - }, - "frame": { - "x": 95, - "y": 0, - "w": 97, - "h": 78 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 94, - "h": 84 - }, - "frame": { - "x": 97, - "y": 78, - "w": 94, - "h": 84 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 1, - "y": 6, - "w": 95, - "h": 81 - }, - "frame": { - "x": 97, - "y": 162, - "w": 95, - "h": 81 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 94, - "h": 84 - }, - "frame": { - "x": 191, - "y": 78, - "w": 94, - "h": 84 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 94, - "h": 77 - }, - "frame": { - "x": 192, - "y": 0, - "w": 94, - "h": 77 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 94, - "h": 77 - }, - "frame": { - "x": 192, - "y": 0, - "w": 94, - "h": 77 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 94, - "h": 83 - }, - "frame": { - "x": 0, - "y": 163, - "w": 94, - "h": 83 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 92, - "h": 83 - }, - "frame": { - "x": 192, - "y": 162, - "w": 92, - "h": 83 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 92, - "h": 82 - }, - "frame": { - "x": 94, - "y": 243, - "w": 92, - "h": 82 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 90, - "h": 78 - }, - "frame": { - "x": 0, - "y": 246, - "w": 90, - "h": 78 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 91, - "h": 81 - }, - "frame": { - "x": 186, - "y": 245, - "w": 91, - "h": 81 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:47e13c1a7a77825c7cf7e9fb039c2587:68949a6c55126e61a0a82829cd6ac5a8:5d19509f6557fe13b0b6311434ba7e2d$" - } -} diff --git a/public/images/pokemon/exp/back/shiny/487-origin.png b/public/images/pokemon/exp/back/shiny/487-origin.png deleted file mode 100644 index 95bee551e5d..00000000000 Binary files a/public/images/pokemon/exp/back/shiny/487-origin.png and /dev/null differ diff --git a/public/images/pokemon/exp/shiny/487-origin.json b/public/images/pokemon/exp/shiny/487-origin.json deleted file mode 100644 index d770a34a1b8..00000000000 --- a/public/images/pokemon/exp/shiny/487-origin.json +++ /dev/null @@ -1,293 +0,0 @@ -{ - "textures": [ - { - "image": "487-origin.png", - "format": "RGBA8888", - "size": { - "w": 318, - "h": 318 - }, - "scale": 1, - "frames": [ - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 0, - "y": 8, - "w": 91, - "h": 77 - }, - "frame": { - "x": 0, - "y": 0, - "w": 91, - "h": 77 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 0, - "y": 10, - "w": 91, - "h": 74 - }, - "frame": { - "x": 91, - "y": 0, - "w": 91, - "h": 74 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 89, - "h": 75 - }, - "frame": { - "x": 182, - "y": 0, - "w": 89, - "h": 75 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 89, - "h": 75 - }, - "frame": { - "x": 182, - "y": 0, - "w": 89, - "h": 75 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 3, - "y": 7, - "w": 86, - "h": 79 - }, - "frame": { - "x": 91, - "y": 74, - "w": 86, - "h": 79 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 85, - "h": 83 - }, - "frame": { - "x": 0, - "y": 77, - "w": 85, - "h": 83 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 85, - "h": 82 - }, - "frame": { - "x": 177, - "y": 75, - "w": 85, - "h": 82 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 83, - "h": 83 - }, - "frame": { - "x": 85, - "y": 153, - "w": 83, - "h": 83 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 80, - "h": 82 - }, - "frame": { - "x": 0, - "y": 236, - "w": 80, - "h": 82 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 83, - "h": 76 - }, - "frame": { - "x": 0, - "y": 160, - "w": 83, - "h": 76 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 81, - "h": 81 - }, - "frame": { - "x": 80, - "y": 236, - "w": 81, - "h": 81 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 5, - "y": 7, - "w": 81, - "h": 80 - }, - "frame": { - "x": 161, - "y": 236, - "w": 81, - "h": 80 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 81, - "h": 79 - }, - "frame": { - "x": 168, - "y": 157, - "w": 81, - "h": 79 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:00abebb007c47ada81d4e754581d7146:4691e19364eb9392dbee1ee37d737c8b:5d19509f6557fe13b0b6311434ba7e2d$" - } -} diff --git a/public/images/pokemon/exp/shiny/487-origin.png b/public/images/pokemon/exp/shiny/487-origin.png deleted file mode 100644 index d0f0fdb6b9b..00000000000 Binary files a/public/images/pokemon/exp/shiny/487-origin.png and /dev/null differ diff --git a/public/images/pokemon/shiny/890.json b/public/images/pokemon/shiny/890.json index 15d4be50370..527f9bbf500 100644 --- a/public/images/pokemon/shiny/890.json +++ b/public/images/pokemon/shiny/890.json @@ -4,30 +4,1815 @@ "image": "890.png", "format": "RGBA8888", "size": { - "w": 92, - "h": 88 + "w": 539, + "h": 539 }, "scale": 1, "frames": [ + { + "filename": "0077.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 0, + "y": 19, + "w": 96, + "h": 66 + }, + "frame": { + "x": 0, + "y": 0, + "w": 96, + "h": 66 + } + }, + { + "filename": "0078.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 0, + "y": 19, + "w": 96, + "h": 66 + }, + "frame": { + "x": 96, + "y": 0, + "w": 96, + "h": 66 + } + }, + { + "filename": "0079.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 0, + "y": 19, + "w": 96, + "h": 66 + }, + "frame": { + "x": 192, + "y": 0, + "w": 96, + "h": 66 + } + }, + { + "filename": "0076.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 0, + "y": 19, + "w": 96, + "h": 67 + }, + "frame": { + "x": 288, + "y": 0, + "w": 96, + "h": 67 + } + }, + { + "filename": "0080.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 1, + "y": 19, + "w": 95, + "h": 67 + }, + "frame": { + "x": 384, + "y": 0, + "w": 95, + "h": 67 + } + }, + { + "filename": "0071.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 0, + "y": 19, + "w": 96, + "h": 68 + }, + "frame": { + "x": 0, + "y": 66, + "w": 96, + "h": 68 + } + }, + { + "filename": "0073.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 0, + "y": 19, + "w": 96, + "h": 68 + }, + "frame": { + "x": 96, + "y": 66, + "w": 96, + "h": 68 + } + }, + { + "filename": "0075.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 0, + "y": 19, + "w": 96, + "h": 68 + }, + "frame": { + "x": 192, + "y": 66, + "w": 96, + "h": 68 + } + }, + { + "filename": "0081.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 0, + "y": 18, + "w": 96, + "h": 68 + }, + "frame": { + "x": 288, + "y": 67, + "w": 96, + "h": 68 + } + }, + { + "filename": "0070.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 0, + "y": 19, + "w": 96, + "h": 69 + }, + "frame": { + "x": 384, + "y": 67, + "w": 96, + "h": 69 + } + }, + { + "filename": "0072.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 0, + "y": 19, + "w": 96, + "h": 69 + }, + "frame": { + "x": 0, + "y": 134, + "w": 96, + "h": 69 + } + }, + { + "filename": "0074.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 0, + "y": 19, + "w": 96, + "h": 69 + }, + "frame": { + "x": 96, + "y": 134, + "w": 96, + "h": 69 + } + }, + { + "filename": "0082.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 0, + "y": 16, + "w": 96, + "h": 71 + }, + "frame": { + "x": 192, + "y": 134, + "w": 96, + "h": 71 + } + }, + { + "filename": "0068.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 6, + "y": 10, + "w": 88, + "h": 73 + }, + "frame": { + "x": 288, + "y": 135, + "w": 88, + "h": 73 + } + }, + { + "filename": "0069.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 4, + "y": 16, + "w": 92, + "h": 73 + }, + "frame": { + "x": 376, + "y": 136, + "w": 92, + "h": 73 + } + }, + { + "filename": "0083.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 1, + "y": 13, + "w": 95, + "h": 74 + }, + "frame": { + "x": 0, + "y": 203, + "w": 95, + "h": 74 + } + }, + { + "filename": "0009.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 1, + "y": 13, + "w": 94, + "h": 76 + }, + "frame": { + "x": 95, + "y": 203, + "w": 94, + "h": 76 + } + }, + { + "filename": "0025.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 1, + "y": 13, + "w": 94, + "h": 76 + }, + "frame": { + "x": 95, + "y": 203, + "w": 94, + "h": 76 + } + }, + { + "filename": "0041.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 1, + "y": 13, + "w": 94, + "h": 76 + }, + "frame": { + "x": 95, + "y": 203, + "w": 94, + "h": 76 + } + }, + { + "filename": "0057.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 1, + "y": 13, + "w": 94, + "h": 76 + }, + "frame": { + "x": 95, + "y": 203, + "w": 94, + "h": 76 + } + }, + { + "filename": "0008.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 2, + "y": 12, + "w": 89, + "h": 77 + }, + "frame": { + "x": 189, + "y": 205, + "w": 89, + "h": 77 + } + }, + { + "filename": "0024.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 2, + "y": 12, + "w": 89, + "h": 77 + }, + "frame": { + "x": 189, + "y": 205, + "w": 89, + "h": 77 + } + }, + { + "filename": "0040.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 2, + "y": 12, + "w": 89, + "h": 77 + }, + "frame": { + "x": 189, + "y": 205, + "w": 89, + "h": 77 + } + }, + { + "filename": "0056.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 2, + "y": 12, + "w": 89, + "h": 77 + }, + "frame": { + "x": 189, + "y": 205, + "w": 89, + "h": 77 + } + }, + { + "filename": "0010.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 2, + "y": 11, + "w": 94, + "h": 77 + }, + "frame": { + "x": 278, + "y": 208, + "w": 94, + "h": 77 + } + }, + { + "filename": "0026.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 2, + "y": 11, + "w": 94, + "h": 77 + }, + "frame": { + "x": 278, + "y": 208, + "w": 94, + "h": 77 + } + }, + { + "filename": "0042.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 2, + "y": 11, + "w": 94, + "h": 77 + }, + "frame": { + "x": 278, + "y": 208, + "w": 94, + "h": 77 + } + }, + { + "filename": "0058.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 2, + "y": 11, + "w": 94, + "h": 77 + }, + "frame": { + "x": 278, + "y": 208, + "w": 94, + "h": 77 + } + }, + { + "filename": "0084.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 1, + "y": 9, + "w": 95, + "h": 77 + }, + "frame": { + "x": 372, + "y": 209, + "w": 95, + "h": 77 + } + }, + { + "filename": "0007.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 2, + "y": 11, + "w": 86, + "h": 78 + }, + "frame": { + "x": 0, + "y": 277, + "w": 86, + "h": 78 + } + }, + { + "filename": "0023.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 2, + "y": 11, + "w": 86, + "h": 78 + }, + "frame": { + "x": 0, + "y": 277, + "w": 86, + "h": 78 + } + }, + { + "filename": "0039.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 2, + "y": 11, + "w": 86, + "h": 78 + }, + "frame": { + "x": 0, + "y": 277, + "w": 86, + "h": 78 + } + }, + { + "filename": "0055.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 2, + "y": 11, + "w": 86, + "h": 78 + }, + "frame": { + "x": 0, + "y": 277, + "w": 86, + "h": 78 + } + }, + { + "filename": "0011.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 4, + "y": 8, + "w": 92, + "h": 78 + }, + "frame": { + "x": 86, + "y": 279, + "w": 92, + "h": 78 + } + }, + { + "filename": "0027.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 4, + "y": 8, + "w": 92, + "h": 78 + }, + "frame": { + "x": 86, + "y": 279, + "w": 92, + "h": 78 + } + }, + { + "filename": "0043.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 4, + "y": 8, + "w": 92, + "h": 78 + }, + "frame": { + "x": 86, + "y": 279, + "w": 92, + "h": 78 + } + }, + { + "filename": "0059.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 4, + "y": 8, + "w": 92, + "h": 78 + }, + "frame": { + "x": 86, + "y": 279, + "w": 92, + "h": 78 + } + }, + { + "filename": "0012.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 91, + "h": 78 + }, + "frame": { + "x": 178, + "y": 282, + "w": 91, + "h": 78 + } + }, + { + "filename": "0028.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 91, + "h": 78 + }, + "frame": { + "x": 178, + "y": 282, + "w": 91, + "h": 78 + } + }, + { + "filename": "0044.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 91, + "h": 78 + }, + "frame": { + "x": 178, + "y": 282, + "w": 91, + "h": 78 + } + }, + { + "filename": "0060.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 91, + "h": 78 + }, + "frame": { + "x": 178, + "y": 282, + "w": 91, + "h": 78 + } + }, + { + "filename": "0013.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 5, + "y": 4, + "w": 91, + "h": 78 + }, + "frame": { + "x": 269, + "y": 285, + "w": 91, + "h": 78 + } + }, + { + "filename": "0029.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 5, + "y": 4, + "w": 91, + "h": 78 + }, + "frame": { + "x": 269, + "y": 285, + "w": 91, + "h": 78 + } + }, + { + "filename": "0045.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 5, + "y": 4, + "w": 91, + "h": 78 + }, + "frame": { + "x": 269, + "y": 285, + "w": 91, + "h": 78 + } + }, + { + "filename": "0061.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 5, + "y": 4, + "w": 91, + "h": 78 + }, + "frame": { + "x": 269, + "y": 285, + "w": 91, + "h": 78 + } + }, + { + "filename": "0067.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 86, + "h": 78 + }, + "frame": { + "x": 360, + "y": 286, + "w": 86, + "h": 78 + } + }, + { + "filename": "0006.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 2, + "y": 9, + "w": 86, + "h": 79 + }, + "frame": { + "x": 446, + "y": 286, + "w": 86, + "h": 79 + } + }, + { + "filename": "0022.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 2, + "y": 9, + "w": 86, + "h": 79 + }, + "frame": { + "x": 446, + "y": 286, + "w": 86, + "h": 79 + } + }, + { + "filename": "0038.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 2, + "y": 9, + "w": 86, + "h": 79 + }, + "frame": { + "x": 446, + "y": 286, + "w": 86, + "h": 79 + } + }, + { + "filename": "0054.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 2, + "y": 9, + "w": 86, + "h": 79 + }, + "frame": { + "x": 446, + "y": 286, + "w": 86, + "h": 79 + } + }, + { + "filename": "0005.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 3, + "y": 6, + "w": 85, + "h": 80 + }, + "frame": { + "x": 0, + "y": 355, + "w": 85, + "h": 80 + } + }, + { + "filename": "0021.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 3, + "y": 6, + "w": 85, + "h": 80 + }, + "frame": { + "x": 0, + "y": 355, + "w": 85, + "h": 80 + } + }, + { + "filename": "0037.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 3, + "y": 6, + "w": 85, + "h": 80 + }, + "frame": { + "x": 0, + "y": 355, + "w": 85, + "h": 80 + } + }, + { + "filename": "0053.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 3, + "y": 6, + "w": 85, + "h": 80 + }, + "frame": { + "x": 0, + "y": 355, + "w": 85, + "h": 80 + } + }, + { + "filename": "0085.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 2, + "y": 6, + "w": 93, + "h": 79 + }, + "frame": { + "x": 85, + "y": 357, + "w": 93, + "h": 79 + } + }, + { + "filename": "0014.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 5, + "y": 2, + "w": 90, + "h": 80 + }, + "frame": { + "x": 178, + "y": 360, + "w": 90, + "h": 80 + } + }, + { + "filename": "0030.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 5, + "y": 2, + "w": 90, + "h": 80 + }, + "frame": { + "x": 178, + "y": 360, + "w": 90, + "h": 80 + } + }, + { + "filename": "0046.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 5, + "y": 2, + "w": 90, + "h": 80 + }, + "frame": { + "x": 178, + "y": 360, + "w": 90, + "h": 80 + } + }, + { + "filename": "0062.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 5, + "y": 2, + "w": 90, + "h": 80 + }, + "frame": { + "x": 178, + "y": 360, + "w": 90, + "h": 80 + } + }, + { + "filename": "0004.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 3, + "y": 4, + "w": 86, + "h": 81 + }, + "frame": { + "x": 268, + "y": 363, + "w": 86, + "h": 81 + } + }, + { + "filename": "0020.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 3, + "y": 4, + "w": 86, + "h": 81 + }, + "frame": { + "x": 268, + "y": 363, + "w": 86, + "h": 81 + } + }, + { + "filename": "0036.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 3, + "y": 4, + "w": 86, + "h": 81 + }, + "frame": { + "x": 268, + "y": 363, + "w": 86, + "h": 81 + } + }, + { + "filename": "0052.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 3, + "y": 4, + "w": 86, + "h": 81 + }, + "frame": { + "x": 268, + "y": 363, + "w": 86, + "h": 81 + } + }, + { + "filename": "0002.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 4, + "y": 1, + "w": 88, + "h": 82 + }, + "frame": { + "x": 354, + "y": 364, + "w": 88, + "h": 82 + } + }, + { + "filename": "0018.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 4, + "y": 1, + "w": 88, + "h": 82 + }, + "frame": { + "x": 354, + "y": 364, + "w": 88, + "h": 82 + } + }, + { + "filename": "0034.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 4, + "y": 1, + "w": 88, + "h": 82 + }, + "frame": { + "x": 354, + "y": 364, + "w": 88, + "h": 82 + } + }, + { + "filename": "0050.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 4, + "y": 1, + "w": 88, + "h": 82 + }, + "frame": { + "x": 354, + "y": 364, + "w": 88, + "h": 82 + } + }, + { + "filename": "0003.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 4, + "y": 2, + "w": 87, + "h": 82 + }, + "frame": { + "x": 442, + "y": 365, + "w": 87, + "h": 82 + } + }, + { + "filename": "0019.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 4, + "y": 2, + "w": 87, + "h": 82 + }, + "frame": { + "x": 442, + "y": 365, + "w": 87, + "h": 82 + } + }, + { + "filename": "0035.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 4, + "y": 2, + "w": 87, + "h": 82 + }, + "frame": { + "x": 442, + "y": 365, + "w": 87, + "h": 82 + } + }, + { + "filename": "0051.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 4, + "y": 2, + "w": 87, + "h": 82 + }, + "frame": { + "x": 442, + "y": 365, + "w": 87, + "h": 82 + } + }, + { + "filename": "0015.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 4, + "y": 1, + "w": 91, + "h": 82 + }, + "frame": { + "x": 0, + "y": 436, + "w": 91, + "h": 82 + } + }, + { + "filename": "0031.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 4, + "y": 1, + "w": 91, + "h": 82 + }, + "frame": { + "x": 0, + "y": 436, + "w": 91, + "h": 82 + } + }, + { + "filename": "0047.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 4, + "y": 1, + "w": 91, + "h": 82 + }, + "frame": { + "x": 0, + "y": 436, + "w": 91, + "h": 82 + } + }, + { + "filename": "0063.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 4, + "y": 1, + "w": 91, + "h": 82 + }, + "frame": { + "x": 0, + "y": 436, + "w": 91, + "h": 82 + } + }, + { + "filename": "0066.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 5, + "y": 2, + "w": 88, + "h": 82 + }, + "frame": { + "x": 91, + "y": 440, + "w": 88, + "h": 82 + } + }, + { + "filename": "0065.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 89, + "h": 85 + }, + "frame": { + "x": 179, + "y": 440, + "w": 89, + "h": 85 + } + }, + { + "filename": "0086.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 3, + "y": 3, + "w": 91, + "h": 82 + }, + "frame": { + "x": 268, + "y": 446, + "w": 91, + "h": 82 + } + }, { "filename": "0001.png", "rotated": false, "trimmed": true, "sourceSize": { "w": 96, - "h": 96 + "h": 89 }, "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 92, - "h": 88 + "x": 4, + "y": 0, + "w": 90, + "h": 84 }, "frame": { - "x": 0, + "x": 359, + "y": 447, + "w": 90, + "h": 84 + } + }, + { + "filename": "0017.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 4, "y": 0, - "w": 92, - "h": 88 + "w": 90, + "h": 84 + }, + "frame": { + "x": 359, + "y": 447, + "w": 90, + "h": 84 + } + }, + { + "filename": "0033.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 90, + "h": 84 + }, + "frame": { + "x": 359, + "y": 447, + "w": 90, + "h": 84 + } + }, + { + "filename": "0049.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 90, + "h": 84 + }, + "frame": { + "x": 359, + "y": 447, + "w": 90, + "h": 84 + } + }, + { + "filename": "0016.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 90, + "h": 84 + }, + "frame": { + "x": 449, + "y": 447, + "w": 90, + "h": 84 + } + }, + { + "filename": "0032.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 90, + "h": 84 + }, + "frame": { + "x": 449, + "y": 447, + "w": 90, + "h": 84 + } + }, + { + "filename": "0048.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 90, + "h": 84 + }, + "frame": { + "x": 449, + "y": 447, + "w": 90, + "h": 84 + } + }, + { + "filename": "0064.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 89 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 90, + "h": 84 + }, + "frame": { + "x": 449, + "y": 447, + "w": 90, + "h": 84 } } ] @@ -36,6 +1821,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:15403e46a7a5b364c2a2147d4eb7d7c3:2e867b4ea704cf035cb5af056c17a9c3:cedd2711a12bbacba5623505fe88bd92$" + "smartupdate": "$TexturePacker:SmartUpdate:fa96c0e3d65728e89186519f4cb67c52:fea71255f53302925c1d757e4cf5549f:cedd2711a12bbacba5623505fe88bd92$" } } diff --git a/public/images/pokemon/shiny/890.png b/public/images/pokemon/shiny/890.png index d59419ca66c..98e82b38b21 100644 Binary files a/public/images/pokemon/shiny/890.png and b/public/images/pokemon/shiny/890.png differ diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts index b190729621c..71807288abc 100644 --- a/src/data/moves/move.ts +++ b/src/data/moves/move.ts @@ -6390,8 +6390,23 @@ export class ForceSwitchOutAttr extends MoveEffectAttr { return (user, target, move) => { const switchOutTarget = (this.selfSwitch ? user : target); const player = switchOutTarget instanceof PlayerPokemon; + const forceSwitchAttr = move.getAttrs(ForceSwitchOutAttr).find(attr => attr.switchType === SwitchType.FORCE_SWITCH); if (!this.selfSwitch) { + if (move.hitsSubstitute(user, target)) { + return false; + } + + // Check if the move is Roar or Whirlwind and if there is a trainer with only Pokémon left. + if (forceSwitchAttr && globalScene.currentBattle.trainer) { + const enemyParty = globalScene.getEnemyParty(); + // Filter out any Pokémon that are not allowed in battle (e.g. fainted ones) + const remainingPokemon = enemyParty.filter(p => p.hp > 0 && p.isAllowedInBattle()); + if (remainingPokemon.length <= 1) { + return false; + } + } + // Dondozo with an allied Tatsugiri in its mouth cannot be forced out const commandedTag = switchOutTarget.getTag(BattlerTagType.COMMANDED); if (commandedTag?.getSourcePokemon()?.isActive(true)) { diff --git a/test/moves/whirlwind.test.ts b/test/moves/whirlwind.test.ts index 6b5133ec7b1..67ffb77612c 100644 --- a/test/moves/whirlwind.test.ts +++ b/test/moves/whirlwind.test.ts @@ -10,6 +10,7 @@ import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import { Status } from "#app/data/status-effect"; import { StatusEffect } from "#enums/status-effect"; +import { globalScene } from "#app/global-scene"; import { BattlerIndex } from "#app/battle"; import { BattleType } from "#enums/battle-type"; import { TrainerType } from "#enums/trainer-type"; @@ -161,6 +162,37 @@ describe("Moves - Whirlwind", () => { expect(eevee.isOnField()).toBe(false); }); + it("should fail when player uses Whirlwind against an opponent with only one available Pokémon", async () => { + // Set up the battle scenario with the player knowing Whirlwind + game.override.startingWave(5).enemySpecies(Species.PIDGEY).moveset([Moves.WHIRLWIND]); + await game.classicMode.startBattle(); + + const enemyParty = game.scene.getEnemyParty(); + + // Ensure the opponent has only one available Pokémon + if (enemyParty.length > 1) { + enemyParty.slice(1).forEach(p => { + p.hp = 0; + p.status = new Status(StatusEffect.FAINT); + }); + } + const eligibleEnemy = enemyParty.filter(p => p.hp > 0 && p.isAllowedInBattle()); + expect(eligibleEnemy.length).toBe(1); + + // Spy on the queueMessage function + const queueSpy = vi.spyOn(globalScene, "queueMessage"); + + // Player uses Whirlwind; opponent uses Splash + game.move.select(Moves.WHIRLWIND); + await game.forceEnemyMove(Moves.SPLASH); + await game.toNextTurn(); + + // Verify that the failure message is displayed for Whirlwind + expect(queueSpy).toHaveBeenCalledWith(expect.stringContaining("But it failed")); + // Verify the opponent's Splash message + expect(queueSpy).toHaveBeenCalledWith(expect.stringContaining("But nothing happened!")); + }); + it("should not pull in the other trainer's pokemon in a partner trainer battle", async () => { game.override .startingWave(2)