Merge branch 'main' into implement-incinerate-move

.github/workflows/deploy.yml

@@ -41,4 +41,6 @@ jobs:
           files: |
             https://pokerogue.net/
             https://pokerogue.net/index.html
-            https://pokerogue.net/manifest.json
+            https://pokerogue.net/manifest.json
+            https://pokerogue.net/manifest.webmanifest
+            https://pokerogue.net/service-worker.js

.gitignore

@@ -33,5 +33,6 @@ public/images/pokemon/icons/input/output/*
 public/images/character/*/
 src/data/battle-anim-raw-data*.ts
 src/data/battle-anim-data.ts
+src/overrides.ts
 
 coverage

README.md

@@ -19,7 +19,7 @@ If you have the motivation and experience with Typescript/Javascript (or are wil
 ### ❔ FAQ 
 
 **How do I test a new _______?**
-- In the `battle-scene.ts` file there are overrides for most values you'll need to change for testing
+- In the `src/overrides.ts` file there are overrides for most values you'll need to change for testing
 
 
 ## 🪧 To Do

index.css

@@ -150,6 +150,10 @@ body {
   display: none;
 }
 
+#touchControls:not([data-ui-mode='COMMAND']):not([data-ui-mode='FIGHT']):not([data-ui-mode='BALL']):not([data-ui-mode='TARGET_SELECT']) #apad #apadStats {
+  display: none;
+}
+
 #apad .apadRectBtnContainer + .apadSqBtnContainer {
   top: calc(var(--controls-size) * -1.9);
   left: calc(var(--controls-size) * -0.9);

index.html

@@ -74,6 +74,9 @@
 				<div id="apadCycleVariant" class="apadSqBtn apadBtn" data-key="CYCLE_VARIANT">
 					<text class="apadLabel apadLabelSmall">V</text>
 				</div>
+				<div id="apadStats" class="apadRectBtn apadBtn" data-key="STATS">
+					<text class="apadLabel apadLabelSmall">C</text>
+				</div>
 				<div id="apadMenu" class="apadRectBtn apadBtn" data-key="MENU">
 					<text class="apadLabel apadLabelSmall">Menu</text>
 				</div>

package-lock.json

@@ -1,16 +1,17 @@
 {
 	"name": "pokemon-rogue-battle",
-	"version": "1.0.1",
+	"version": "1.0.4",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "pokemon-rogue-battle",
-			"version": "1.0.1",
+			"version": "1.0.4",
 			"dependencies": {
 				"@material/material-color-utilities": "^0.2.7",
 				"crypto-js": "^4.2.0",
 				"i18next": "^23.11.1",
+				"i18next-browser-languagedetector": "^7.2.1",
 				"json-stable-stringify": "^1.1.0",
 				"phaser": "^3.70.0",
 				"phaser3-rex-plugins": "^1.1.84"
@@ -2772,6 +2773,14 @@
 				"@babel/runtime": "^7.23.2"
 			}
 		},
+		"node_modules/i18next-browser-languagedetector": {
+			"version": "7.2.1",
+			"resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-7.2.1.tgz",
+			"integrity": "sha512-h/pM34bcH6tbz8WgGXcmWauNpQupCGr25XPp9cZwZInR9XHSjIFDYp1SIok7zSPsTOMxdvuLyu86V+g2Kycnfw==",
+			"dependencies": {
+				"@babel/runtime": "^7.23.2"
+			}
+		},
 		"node_modules/i18next-http-backend": {
 			"version": "2.5.0",
 			"resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-2.5.0.tgz",

package.json

@@ -31,6 +31,7 @@
 		"@material/material-color-utilities": "^0.2.7",
 		"crypto-js": "^4.2.0",
 		"i18next": "^23.11.1",
+		"i18next-browser-languagedetector": "^7.2.1",
 		"json-stable-stringify": "^1.1.0",
 		"phaser": "^3.70.0",
 		"phaser3-rex-plugins": "^1.1.84"

public/images/pbinfo_stat_numbers.json

@@ -0,0 +1,293 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_numbers.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 117,
+				"h": 8
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "+1",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					}
+				},
+				{
+					"filename": "+2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					},
+					"frame": {
+						"x": 9,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					}
+				},
+				{
+					"filename": "+3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					},
+					"frame": {
+						"x": 18,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					}
+				},
+				{
+					"filename": "+4",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					},
+					"frame": {
+						"x": 27,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					}
+				},
+				{
+					"filename": "+5",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					},
+					"frame": {
+						"x": 36,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					}
+				},
+				{
+					"filename": "+6",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					},
+					"frame": {
+						"x": 45,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					}
+				},
+				{
+					"filename": "-1",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					},
+					"frame": {
+						"x": 54,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					}
+				},
+				{
+					"filename": "-2",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					},
+					"frame": {
+						"x": 63,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					}
+				},
+				{
+					"filename": "-3",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					},
+					"frame": {
+						"x": 72,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					}
+				},
+				{
+					"filename": "-4",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					},
+					"frame": {
+						"x": 81,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					}
+				},
+				{
+					"filename": "-5",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					},
+					"frame": {
+						"x": 90,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					}
+				},
+				{
+					"filename": "-6",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					},
+					"frame": {
+						"x": 99,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					}
+				},
+				{
+					"filename": "0",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					},
+					"frame": {
+						"x": 108,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:794aa4af3291db5abd8a2667626c1998:1a6706ad557b92f9bf099c23e02af4a6:6537c634087637bb27e8a1edb1ee2e35$"
+	}
+}

public/images/pokemon/676-dandy.json

@@ -4,30 +4,30 @@
 			"image": "676-dandy.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 71,
+				"w": 65,
-				"h": 71
+				"h": 65
 			},
-			"scale": 1,
+			"scale": 0.5,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 56,
+						"w": 96,
-						"h": 71
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 22,
-						"y": 0,
+						"y": 15,
-						"w": 56,
+						"w": 50,
-						"h": 71
+						"h": 65
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 56,
+						"w": 50,
-						"h": 71
+						"h": 65
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:29165e5c573c8a4235076355ce5d29d5:17a1912fd81d23ce8a7209e27ad3e9ed:b5a287256e260744fe6660dc2ceefd11$"
+		"smartupdate": "$TexturePacker:SmartUpdate:c09947cc1f66b7a7bf844a7caaa3bd76:20ba7e14cce8a9ee80955d94d19ae46f:b5a287256e260744fe6660dc2ceefd11$"
 	}
 }

public/images/pokemon/676-debutante.json

@@ -4,30 +4,30 @@
 			"image": "676-debutante.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 67,
+				"w": 61,
-				"h": 67
+				"h": 61
 			},
-			"scale": 1,
+			"scale": 0.5,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 56,
+						"w": 96,
-						"h": 67
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 20,
-						"y": 0,
+						"y": 19,
-						"w": 56,
+						"w": 50,
-						"h": 67
+						"h": 61
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 56,
+						"w": 50,
-						"h": 67
+						"h": 61
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:689efba1d73755e99f598016fd321c3c:07d06d321fff31976e1b993edb972e4f:bf2f862a1c8881133f9f3ffbf44602fa$"
+		"smartupdate": "$TexturePacker:SmartUpdate:107780a0e7447bf89ae4998e24021f8b:7623c7ab8d7b6bc5f755e8a1f81ea257:bf2f862a1c8881133f9f3ffbf44602fa$"
 	}
 }

public/images/pokemon/676-diamond.json

@@ -4,30 +4,30 @@
 			"image": "676-diamond.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 74,
+				"w": 68,
-				"h": 74
+				"h": 68
 			},
-			"scale": 1,
+			"scale": 0.5,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 53,
+						"w": 96,
-						"h": 74
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 24,
-						"y": 0,
+						"y": 12,
-						"w": 53,
+						"w": 47,
-						"h": 74
+						"h": 68
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 53,
+						"w": 47,
-						"h": 74
+						"h": 68
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:b33f3de937219e7763316531398d7bbd:c7e104da9393ec52b9e6d37f92fc20d9:88c467fc09249b0d2f579d44eacd528d$"
+		"smartupdate": "$TexturePacker:SmartUpdate:90477dc67c3429f2f0430f0a868ed85c:bd69660307b7d945313b73a256c24d57:88c467fc09249b0d2f579d44eacd528d$"
 	}
 }

public/images/pokemon/676-heart.json

@@ -4,30 +4,30 @@
 			"image": "676-heart.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 72,
+				"w": 66,
-				"h": 72
+				"h": 66
 			},
-			"scale": 1,
+			"scale": 0.5,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 54,
+						"w": 96,
-						"h": 72
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 24,
-						"y": 0,
+						"y": 14,
-						"w": 54,
+						"w": 48,
-						"h": 72
+						"h": 66
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 54,
+						"w": 48,
-						"h": 72
+						"h": 66
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:15e433a2269dd4043b1614811a1b8fbd:421a40542b16cdb2cc154c85e963b40d:e11d4dd16bff2ef69bc5ca683c44ca7c$"
+		"smartupdate": "$TexturePacker:SmartUpdate:a9b1c7a73abb563b1ecadad8b517794e:2273c7342204f52860d8e96670ddf46a:e11d4dd16bff2ef69bc5ca683c44ca7c$"
 	}
 }

public/images/pokemon/676-kabuki.json

@@ -4,30 +4,30 @@
 			"image": "676-kabuki.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 70,
+				"w": 64,
-				"h": 70
+				"h": 64
 			},
-			"scale": 1,
+			"scale": 0.5,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 58,
+						"w": 96,
-						"h": 70
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 22,
-						"y": 0,
+						"y": 16,
-						"w": 58,
+						"w": 52,
-						"h": 70
+						"h": 64
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 58,
+						"w": 52,
-						"h": 70
+						"h": 64
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:7f4056b1c055475f905d048c8d8d2969:08eecd31f557298e1570ec3490acffe2:c3cad56aa65d2ee971ceebc435a14ee6$"
+		"smartupdate": "$TexturePacker:SmartUpdate:d36abbc31bcd28664e28eb50f8e4719d:43c9d8bb344b7a1373b93f493badb47e:c3cad56aa65d2ee971ceebc435a14ee6$"
 	}
 }

public/images/pokemon/676-la-reine.json

@@ -4,30 +4,30 @@
 			"image": "676-la-reine.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 69,
+				"w": 63,
-				"h": 69
+				"h": 63
 			},
-			"scale": 1,
+			"scale": 0.5,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 55,
+						"w": 96,
-						"h": 69
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 23,
-						"y": 0,
+						"y": 17,
-						"w": 55,
+						"w": 49,
-						"h": 69
+						"h": 63
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 55,
+						"w": 49,
-						"h": 69
+						"h": 63
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:d209428aca72f49f1e9ee3e97f1c18ab:c56ae957d7acb10c7373b842af3a8786:b99821e87dffda3297dd25a224a9029f$"
+		"smartupdate": "$TexturePacker:SmartUpdate:81b2b5d853a3d2527630ca0b2fea6569:98097941483e509b7962c50b179d132f:b99821e87dffda3297dd25a224a9029f$"
 	}
 }

public/images/pokemon/676-matron.json

@@ -4,30 +4,30 @@
 			"image": "676-matron.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 68,
+				"w": 62,
-				"h": 68
+				"h": 62
 			},
-			"scale": 1,
+			"scale": 0.5,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 52,
+						"w": 96,
-						"h": 68
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 23,
-						"y": 0,
+						"y": 18,
-						"w": 52,
+						"w": 46,
-						"h": 68
+						"h": 62
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 52,
+						"w": 46,
-						"h": 68
+						"h": 62
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:698fab0e5221743b912637e774bfaecd:72a9977db421d061829c639e3b50a617:020798583d07c479020bb0af34cf8bb6$"
+		"smartupdate": "$TexturePacker:SmartUpdate:50d9857668a013306b96adc3777a22b2:7d3708f1b5b6eeb8419815fc6734bf06:020798583d07c479020bb0af34cf8bb6$"
 	}
 }

public/images/pokemon/676-pharaoh.json

@@ -4,30 +4,30 @@
 			"image": "676-pharaoh.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 69,
+				"w": 63,
-				"h": 69
+				"h": 63
 			},
-			"scale": 1,
+			"scale": 0.5,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 52,
+						"w": 96,
-						"h": 69
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 25,
-						"y": 0,
+						"y": 17,
-						"w": 52,
+						"w": 46,
-						"h": 69
+						"h": 63
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 52,
+						"w": 46,
-						"h": 69
+						"h": 63
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:5c1df95bcf0d53d4f1b9f1bf77690598:623b4bc6698ef1a984b6bad42e68115b:904b7ab6f57249c96beea4b5f72deb53$"
+		"smartupdate": "$TexturePacker:SmartUpdate:69f1be06f9a7175f294267b08e7ba275:42e7e4068e30b78248d3629cffa5d2ec:904b7ab6f57249c96beea4b5f72deb53$"
 	}
 }

public/images/pokemon/676-star.json

@@ -4,30 +4,30 @@
 			"image": "676-star.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 72,
+				"w": 66,
-				"h": 72
+				"h": 66
 			},
-			"scale": 1,
+			"scale": 0.5,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 56,
+						"w": 96,
-						"h": 72
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 24,
-						"y": 0,
+						"y": 14,
-						"w": 56,
+						"w": 50,
-						"h": 72
+						"h": 66
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 56,
+						"w": 50,
-						"h": 72
+						"h": 66
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:31c1ce60aa953fb647ff40c50ac54cf1:d7eefc05e299310d05d389e05997e449:dd7fedf66b493b0bbdef5d25e0041dd8$"
+		"smartupdate": "$TexturePacker:SmartUpdate:fde8824a7749541f5af1cc14e6281670:204c6eb602358a5c7c1389b42317ffce:dd7fedf66b493b0bbdef5d25e0041dd8$"
 	}
 }

public/images/pokemon/back/676-dandy.json

@@ -4,30 +4,30 @@
 			"image": "676-dandy.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 72,
+				"w": 66,
-				"h": 72
+				"h": 66
 			},
-			"scale": 1,
+			"scale": 0.333,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 62,
+						"w": 96,
-						"h": 72
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 20,
-						"y": 0,
+						"y": 14,
-						"w": 62,
+						"w": 56,
-						"h": 72
+						"h": 66
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 62,
+						"w": 56,
-						"h": 72
+						"h": 66
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:92d02eca8d05166d15bfa8b79ac478b9:f01538e7a19ca3d0d2fea48cd27d8a4c:b5a287256e260744fe6660dc2ceefd11$"
+		"smartupdate": "$TexturePacker:SmartUpdate:24899e1e616c6a0b9143d36903f9249e:8132d78c7f1f4ab0f673c82868b6a090:b5a287256e260744fe6660dc2ceefd11$"
 	}
 }

public/images/pokemon/back/676-debutante.json

@@ -4,30 +4,30 @@
 			"image": "676-debutante.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 68,
+				"w": 62,
-				"h": 68
+				"h": 62
 			},
-			"scale": 1,
+			"scale": 0.333,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 57,
+						"w": 96,
-						"h": 68
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 25,
-						"y": 0,
+						"y": 18,
-						"w": 57,
+						"w": 51,
-						"h": 68
+						"h": 62
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 57,
+						"w": 51,
-						"h": 68
+						"h": 62
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:76ef75ea5c9561531c220cdb7f78934d:6f39eb82deb32d251df708f5d4edc9f1:bf2f862a1c8881133f9f3ffbf44602fa$"
+		"smartupdate": "$TexturePacker:SmartUpdate:ba172ad89c93e6e6f36f621c38e54754:7c9d0d13f309221141cd334833e412a5:bf2f862a1c8881133f9f3ffbf44602fa$"
 	}
 }

public/images/pokemon/back/676-diamond.json

@@ -4,30 +4,30 @@
 			"image": "676-diamond.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 74,
+				"w": 68,
-				"h": 74
+				"h": 68
 			},
-			"scale": 1,
+			"scale": 0.333,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 51,
+						"w": 96,
-						"h": 74
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 27,
-						"y": 0,
+						"y": 12,
-						"w": 51,
+						"w": 45,
-						"h": 74
+						"h": 68
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 51,
+						"w": 45,
-						"h": 74
+						"h": 68
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:d2b094f0534f6acd2e5bbe67b8e94fa8:47037a1746645a551e31781cb8262e1f:88c467fc09249b0d2f579d44eacd528d$"
+		"smartupdate": "$TexturePacker:SmartUpdate:0a6f3993923b87e1c16c84b1aa8c3705:6d59d20d1b0cd07c3e7a16eadf0de4cf:88c467fc09249b0d2f579d44eacd528d$"
 	}
 }

public/images/pokemon/back/676-heart.json

@@ -4,30 +4,30 @@
 			"image": "676-heart.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 71,
+				"w": 65,
-				"h": 71
+				"h": 65
 			},
-			"scale": 1,
+			"scale": 0.333,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 52,
+						"w": 96,
-						"h": 71
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 26,
-						"y": 0,
+						"y": 15,
-						"w": 52,
+						"w": 46,
-						"h": 71
+						"h": 65
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 52,
+						"w": 46,
-						"h": 71
+						"h": 65
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:537e6149183f630be038f053dd62d27d:dce25f0e6474cad17709f18c96ffb3e5:e11d4dd16bff2ef69bc5ca683c44ca7c$"
+		"smartupdate": "$TexturePacker:SmartUpdate:f99ca7d216355ffd449999125499d32e:cf2dd50594846ac631d9da32cd66dceb:e11d4dd16bff2ef69bc5ca683c44ca7c$"
 	}
 }

public/images/pokemon/back/676-kabuki.json

@@ -4,30 +4,30 @@
 			"image": "676-kabuki.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 71,
+				"w": 65,
-				"h": 71
+				"h": 65
 			},
-			"scale": 1,
+			"scale": 0.333,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 55,
+						"w": 96,
-						"h": 71
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 23,
-						"y": 0,
+						"y": 15,
-						"w": 55,
+						"w": 49,
-						"h": 71
+						"h": 65
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 55,
+						"w": 49,
-						"h": 71
+						"h": 65
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:dfc02a08763810a151fc4e22c23a3093:2f6c7f2792f64728b478333fc2c65138:c3cad56aa65d2ee971ceebc435a14ee6$"
+		"smartupdate": "$TexturePacker:SmartUpdate:8de2d15ea2537eb2104a72a133418e94:903840ea77662ae31175e482a712402a:c3cad56aa65d2ee971ceebc435a14ee6$"
 	}
 }

public/images/pokemon/back/676-la-reine.json

@@ -4,30 +4,30 @@
 			"image": "676-la-reine.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 69,
+				"w": 63,
-				"h": 69
+				"h": 63
 			},
-			"scale": 1,
+			"scale": 0.333,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 54,
+						"w": 96,
-						"h": 69
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 24,
-						"y": 0,
+						"y": 17,
-						"w": 54,
+						"w": 48,
-						"h": 69
+						"h": 63
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 54,
+						"w": 48,
-						"h": 69
+						"h": 63
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:014beffd470b78d94c3234500d9dee5b:3261fa54b4c9574937d670de782ca3e8:b99821e87dffda3297dd25a224a9029f$"
+		"smartupdate": "$TexturePacker:SmartUpdate:b72b1f5723bb276f4a555ccdbb3ed4c0:0ab778e99ee37c883a0b1a0f918f1bee:b99821e87dffda3297dd25a224a9029f$"
 	}
 }

public/images/pokemon/back/676-matron.json

@@ -4,30 +4,30 @@
 			"image": "676-matron.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 68,
+				"w": 62,
-				"h": 68
+				"h": 62
 			},
-			"scale": 1,
+			"scale": 0.333,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 53,
+						"w": 96,
-						"h": 68
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 26,
-						"y": 0,
+						"y": 18,
-						"w": 53,
+						"w": 47,
-						"h": 68
+						"h": 62
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 53,
+						"w": 47,
-						"h": 68
+						"h": 62
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:a9199442be3400b8a70f8ad212790732:18b55adc9c377d1b24d6b236e1f39177:020798583d07c479020bb0af34cf8bb6$"
+		"smartupdate": "$TexturePacker:SmartUpdate:d447de0737ae7f9ca8690e7f039a884d:1ffc2bfd67fda79ede1d0e489bf36c94:020798583d07c479020bb0af34cf8bb6$"
 	}
 }

public/images/pokemon/back/676-pharaoh.json

@@ -4,30 +4,30 @@
 			"image": "676-pharaoh.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 70,
+				"w": 64,
-				"h": 70
+				"h": 64
 			},
-			"scale": 1,
+			"scale": 0.333,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 53,
+						"w": 96,
-						"h": 70
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 25,
-						"y": 0,
+						"y": 16,
-						"w": 53,
+						"w": 47,
-						"h": 70
+						"h": 64
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 53,
+						"w": 47,
-						"h": 70
+						"h": 64
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:be799b3acab0a591e7b2d4a2ad903c94:6260eeb9aa48a1047c8ec12842ac28c6:904b7ab6f57249c96beea4b5f72deb53$"
+		"smartupdate": "$TexturePacker:SmartUpdate:729eefb95778889aa11840e684f35af8:9c72a2d345e9be40096dffd6b99a7ba0:904b7ab6f57249c96beea4b5f72deb53$"
 	}
 }

public/images/pokemon/back/676-star.json

@@ -4,30 +4,30 @@
 			"image": "676-star.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 72,
+				"w": 66,
-				"h": 72
+				"h": 66
 			},
-			"scale": 1,
+			"scale": 0.333,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 54,
+						"w": 96,
-						"h": 72
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 24,
-						"y": 0,
+						"y": 14,
-						"w": 54,
+						"w": 48,
-						"h": 72
+						"h": 66
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 54,
+						"w": 48,
-						"h": 72
+						"h": 66
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:8a18f8f110bc4f6f6e86ca95b9a566b8:c9e3d3db02b6ea0720a20b9bbd159d79:dd7fedf66b493b0bbdef5d25e0041dd8$"
+		"smartupdate": "$TexturePacker:SmartUpdate:37e89522e7b92408df9d52c3d98137ea:241a531f0918e0a4b616569e7d4bc186:dd7fedf66b493b0bbdef5d25e0041dd8$"
 	}
 }

public/images/pokemon/back/shiny/676-dandy.json

@@ -4,30 +4,30 @@
 			"image": "676-dandy.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 72,
+				"w": 66,
-				"h": 72
+				"h": 66
 			},
-			"scale": 1,
+			"scale": 0.333,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 62,
+						"w": 96,
-						"h": 72
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 20,
-						"y": 0,
+						"y": 14,
-						"w": 62,
+						"w": 56,
-						"h": 72
+						"h": 66
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 62,
+						"w": 56,
-						"h": 72
+						"h": 66
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:9a72775f436bbda574bf3721630310fb:f01538e7a19ca3d0d2fea48cd27d8a4c:b5a287256e260744fe6660dc2ceefd11$"
+		"smartupdate": "$TexturePacker:SmartUpdate:30c2972a226f8e360e323bea40a8005e:232a9bbcc4dba00a033204f1ec06cffd:b5a287256e260744fe6660dc2ceefd11$"
 	}
 }

public/images/pokemon/back/shiny/676-debutante.json

@@ -4,30 +4,30 @@
 			"image": "676-debutante.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 68,
+				"w": 62,
-				"h": 68
+				"h": 62
 			},
-			"scale": 1,
+			"scale": 0.333,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 57,
+						"w": 96,
-						"h": 68
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 25,
-						"y": 0,
+						"y": 18,
-						"w": 57,
+						"w": 51,
-						"h": 68
+						"h": 62
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 57,
+						"w": 51,
-						"h": 68
+						"h": 62
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:6d038d8d188d6e545741353c2dd5b812:6f39eb82deb32d251df708f5d4edc9f1:bf2f862a1c8881133f9f3ffbf44602fa$"
+		"smartupdate": "$TexturePacker:SmartUpdate:5a68081e37dfebc3935ecf4a4fbee3ad:71cbee6966c08512b0617eba3ce34a49:bf2f862a1c8881133f9f3ffbf44602fa$"
 	}
 }

public/images/pokemon/back/shiny/676-diamond.json

@@ -4,30 +4,30 @@
 			"image": "676-diamond.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 74,
+				"w": 68,
-				"h": 74
+				"h": 68
 			},
-			"scale": 1,
+			"scale": 0.333,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 51,
+						"w": 96,
-						"h": 74
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 27,
-						"y": 0,
+						"y": 12,
-						"w": 51,
+						"w": 45,
-						"h": 74
+						"h": 68
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 51,
+						"w": 45,
-						"h": 74
+						"h": 68
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:6e2189160ebb9fff02e9a051ee296d91:47037a1746645a551e31781cb8262e1f:88c467fc09249b0d2f579d44eacd528d$"
+		"smartupdate": "$TexturePacker:SmartUpdate:2d32af44d56592301808b561e6fa22f6:c70b6710f9c7ebb5268979a777193386:88c467fc09249b0d2f579d44eacd528d$"
 	}
 }

public/images/pokemon/back/shiny/676-heart.json

@@ -4,30 +4,30 @@
 			"image": "676-heart.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 71,
+				"w": 65,
-				"h": 71
+				"h": 65
 			},
-			"scale": 1,
+			"scale": 0.333,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 52,
+						"w": 96,
-						"h": 71
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 26,
-						"y": 0,
+						"y": 15,
-						"w": 52,
+						"w": 46,
-						"h": 71
+						"h": 65
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 52,
+						"w": 46,
-						"h": 71
+						"h": 65
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:bd54cfc49b95a12709696441044b115c:dce25f0e6474cad17709f18c96ffb3e5:e11d4dd16bff2ef69bc5ca683c44ca7c$"
+		"smartupdate": "$TexturePacker:SmartUpdate:e936d451ba0b36434d6444cb1b80f4d9:0b0d0b49e11fcc790a20130e3ab18ca5:e11d4dd16bff2ef69bc5ca683c44ca7c$"
 	}
 }

public/images/pokemon/back/shiny/676-kabuki.json

@@ -4,30 +4,30 @@
 			"image": "676-kabuki.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 71,
+				"w": 65,
-				"h": 71
+				"h": 65
 			},
-			"scale": 1,
+			"scale": 0.333,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 55,
+						"w": 96,
-						"h": 71
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 23,
-						"y": 0,
+						"y": 15,
-						"w": 55,
+						"w": 49,
-						"h": 71
+						"h": 65
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 55,
+						"w": 49,
-						"h": 71
+						"h": 65
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:5bd5ad9678c59b2b1d85a6af103ba1ba:2f6c7f2792f64728b478333fc2c65138:c3cad56aa65d2ee971ceebc435a14ee6$"
+		"smartupdate": "$TexturePacker:SmartUpdate:517d96cd6baa5b7616a51e8c4fed7a55:0a0f239ab3df60459410fab5eba8a4e6:c3cad56aa65d2ee971ceebc435a14ee6$"
 	}
 }

public/images/pokemon/back/shiny/676-la-reine.json

@@ -4,30 +4,30 @@
 			"image": "676-la-reine.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 69,
+				"w": 63,
-				"h": 69
+				"h": 63
 			},
-			"scale": 1,
+			"scale": 0.333,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 54,
+						"w": 96,
-						"h": 69
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 24,
-						"y": 0,
+						"y": 17,
-						"w": 54,
+						"w": 48,
-						"h": 69
+						"h": 63
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 54,
+						"w": 48,
-						"h": 69
+						"h": 63
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:e01297ffc2dd40460e87b64750997ca6:3261fa54b4c9574937d670de782ca3e8:b99821e87dffda3297dd25a224a9029f$"
+		"smartupdate": "$TexturePacker:SmartUpdate:e2179e3c9dfa079f84af302283187a80:518e57f1e0614d1aedad1d9826def3d4:b99821e87dffda3297dd25a224a9029f$"
 	}
 }

public/images/pokemon/back/shiny/676-matron.json

@@ -4,30 +4,30 @@
 			"image": "676-matron.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 68,
+				"w": 62,
-				"h": 68
+				"h": 62
 			},
-			"scale": 1,
+			"scale": 0.333,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 53,
+						"w": 96,
-						"h": 68
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 26,
-						"y": 0,
+						"y": 18,
-						"w": 53,
+						"w": 47,
-						"h": 68
+						"h": 62
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 53,
+						"w": 47,
-						"h": 68
+						"h": 62
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:262f28877dc9ef9e7920282c4b36b8dd:18b55adc9c377d1b24d6b236e1f39177:020798583d07c479020bb0af34cf8bb6$"
+		"smartupdate": "$TexturePacker:SmartUpdate:6c9b45763eb4fedb5ec7099762f23606:884e9813686e91cf2a2cd9f51652a875:020798583d07c479020bb0af34cf8bb6$"
 	}
 }

public/images/pokemon/back/shiny/676-pharaoh.json

@@ -4,30 +4,30 @@
 			"image": "676-pharaoh.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 70,
+				"w": 64,
-				"h": 70
+				"h": 64
 			},
-			"scale": 1,
+			"scale": 0.333,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 53,
+						"w": 96,
-						"h": 70
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 25,
-						"y": 0,
+						"y": 16,
-						"w": 53,
+						"w": 47,
-						"h": 70
+						"h": 64
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 53,
+						"w": 47,
-						"h": 70
+						"h": 64
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:a5d56fc494b2194036a8d6d1d876a296:6260eeb9aa48a1047c8ec12842ac28c6:904b7ab6f57249c96beea4b5f72deb53$"
+		"smartupdate": "$TexturePacker:SmartUpdate:5143f43786377eae745a9355e5e1cc24:158aa35a349be4cf7c56820170aa4546:904b7ab6f57249c96beea4b5f72deb53$"
 	}
 }

public/images/pokemon/back/shiny/676-star.json

@@ -4,30 +4,30 @@
 			"image": "676-star.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 72,
+				"w": 66,
-				"h": 72
+				"h": 66
 			},
-			"scale": 1,
+			"scale": 0.333,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 54,
+						"w": 96,
-						"h": 72
+						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 24,
-						"y": 0,
+						"y": 14,
-						"w": 54,
+						"w": 48,
-						"h": 72
+						"h": 66
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 54,
+						"w": 48,
-						"h": 72
+						"h": 66
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:6be66775c485bf44d69f7cd44e346324:c9e3d3db02b6ea0720a20b9bbd159d79:dd7fedf66b493b0bbdef5d25e0041dd8$"
+		"smartupdate": "$TexturePacker:SmartUpdate:d9af00245cb6498c9dec7508ed563454:12f19bad174b64678e8b8be8455f2b5a:dd7fedf66b493b0bbdef5d25e0041dd8$"
 	}
 }

public/images/pokemon/back/shiny/678.json

@@ -4,219 +4,30 @@
 			"image": "678.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 157,
+				"w": 55,
-				"h": 157
+				"h": 55
 			},
-			"scale": 1,
+			"scale": 0.333,
 			"frames": [
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 16,
-						"w": 54,
-						"h": 60
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 54,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 16,
-						"w": 54,
-						"h": 60
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 54,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 15,
-						"w": 53,
-						"h": 61
-					},
-					"frame": {
-						"x": 54,
-						"y": 0,
-						"w": 53,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 15,
-						"w": 53,
-						"h": 61
-					},
-					"frame": {
-						"x": 54,
-						"y": 0,
-						"w": 53,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 24,
-						"y": 15,
-						"w": 52,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 60,
-						"w": 52,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 24,
-						"y": 15,
-						"w": 52,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 60,
-						"w": 52,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 26,
-						"y": 16,
-						"w": 54,
-						"h": 60
-					},
-					"frame": {
-						"x": 52,
-						"y": 61,
-						"w": 54,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 24,
-						"y": 17,
-						"w": 51,
-						"h": 59
-					},
-					"frame": {
-						"x": 106,
-						"y": 61,
-						"w": 51,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 24,
-						"y": 17,
-						"w": 51,
-						"h": 59
-					},
-					"frame": {
-						"x": 106,
-						"y": 61,
-						"w": 51,
-						"h": 59
-					}
-				},
 				{
 					"filename": "0001.png",
 					"rotated": false,
-					"trimmed": true,
+					"trimmed": false,
 					"sourceSize": {
 						"w": 96,
 						"h": 96
 					},
 					"spriteSourceSize": {
-						"x": 23,
+						"x": 25,
-						"y": 19,
+						"y": 20,
-						"w": 50,
+						"w": 46,
-						"h": 57
+						"h": 55
 					},
 					"frame": {
-						"x": 107,
+						"x": 0,
 						"y": 0,
-						"w": 50,
+						"w": 46,
-						"h": 57
+						"h": 55
 					}
 				}
 			]
@@ -225,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:ab77ad452685ab677c7e5e70a386e880:27bb9b07316cb5c401e67e15e2b0f06a:887aa14e4a3a3e9141c6ae460f968db1$"
+		"smartupdate": "$TexturePacker:SmartUpdate:7b46b2656390e5ddac94370837e7cdaa:7f76286d5acb65066eff0c2532fa7fea:887aa14e4a3a3e9141c6ae460f968db1$"
 	}
 }

public/images/pokemon/exp/945.json

@@ -146,14 +146,14 @@
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 3,
+						"w": 66,
-						"h": 3
+						"h": 55
 					},
 					"frame": {
-						"x": 132,
+						"x": 0,
-						"y": 0,
+						"y": 112,
-						"w": 3,
+						"w": 66,
-						"h": 3
+						"h": 55
 					}
 				},
 				{