Merge branch 'main' of github.com:Greenlamp2/pokerogue into feat/mapping_setting

 Conflicts:

	src/inputs-controller.ts

	src/system/settings.ts

README.md

@@ -44,6 +44,7 @@ Check out our [Trello Board](https://trello.com/b/z10B703R/pokerogue-board) to s
     - Arata Iiyoshi
     - Atsuhiro Ishizuna
   - Pokémon Black/White 2
+  - Firel (Additional biome themes)
   - edifette (Title screen music)
 
 ### 🎵 Sound Effects

public/images/pokemon/exp/back/shiny/716-active.json

@@ -4,302 +4,155 @@
 			"image": "716-active.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 474,
+				"w": 242,
-				"h": 474
+				"h": 242
 			},
 			"scale": 1,
 			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 96
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 96
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 96
-					}
-				},
 				{
 					"filename": "0002.png",
 					"rotated": false,
-					"trimmed": false,
+					"trimmed": true,
 					"sourceSize": {
-						"w": 80,
+						"w": 87,
-						"h": 96
+						"h": 98
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 80,
+						"w": 81,
-						"h": 96
+						"h": 98
 					},
 					"frame": {
 						"x": 0,
-						"y": 96,
+						"y": 0,
-						"w": 80,
+						"w": 81,
-						"h": 96
+						"h": 98
 					}
 				},
 				{
-					"filename": "0014.png",
+					"filename": "0010.png",
 					"rotated": false,
-					"trimmed": false,
+					"trimmed": true,
 					"sourceSize": {
-						"w": 80,
+						"w": 87,
-						"h": 96
+						"h": 98
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 80,
+						"w": 81,
-						"h": 96
+						"h": 98
 					},
 					"frame": {
 						"x": 0,
-						"y": 96,
+						"y": 0,
-						"w": 80,
+						"w": 81,
-						"h": 96
+						"h": 98
 					}
 				},
 				{
 					"filename": "0003.png",
 					"rotated": false,
-					"trimmed": false,
+					"trimmed": true,
 					"sourceSize": {
-						"w": 80,
+						"w": 87,
-						"h": 96
+						"h": 98
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 3,
 						"y": 0,
 						"w": 80,
-						"h": 96
+						"h": 98
 					},
 					"frame": {
-						"x": 0,
+						"x": 81,
-						"y": 192,
+						"y": 0,
 						"w": 80,
-						"h": 96
+						"h": 98
+					}
+				},
+				{
+					"filename": "0009.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 87,
+						"h": 98
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
+						"w": 80,
+						"h": 98
+					},
+					"frame": {
+						"x": 81,
+						"y": 0,
+						"w": 80,
+						"h": 98
 					}
 				},
 				{
 					"filename": "0004.png",
 					"rotated": false,
-					"trimmed": false,
+					"trimmed": true,
 					"sourceSize": {
-						"w": 80,
+						"w": 87,
-						"h": 96
+						"h": 98
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 4,
 						"y": 0,
 						"w": 80,
-						"h": 96
+						"h": 98
 					},
 					"frame": {
-						"x": 0,
+						"x": 161,
-						"y": 288,
+						"y": 0,
 						"w": 80,
-						"h": 96
+						"h": 98
 					}
 				},
 				{
-					"filename": "0015.png",
+					"filename": "0008.png",
 					"rotated": false,
-					"trimmed": false,
+					"trimmed": true,
 					"sourceSize": {
-						"w": 80,
+						"w": 87,
-						"h": 96
+						"h": 98
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 4,
 						"y": 0,
 						"w": 80,
-						"h": 96
+						"h": 98
 					},
 					"frame": {
-						"x": 0,
+						"x": 161,
-						"y": 288,
+						"y": 0,
 						"w": 80,
-						"h": 96
+						"h": 98
 					}
 				},
 				{
 					"filename": "0005.png",
 					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 96
-					},
-					"frame": {
-						"x": 80,
-						"y": 0,
-						"w": 80,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 96
-					},
-					"frame": {
-						"x": 160,
-						"y": 0,
-						"w": 80,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 96
-					},
-					"frame": {
-						"x": 240,
-						"y": 0,
-						"w": 80,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 96
-					},
-					"frame": {
-						"x": 320,
-						"y": 0,
-						"w": 80,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 96
-					},
-					"frame": {
-						"x": 80,
-						"y": 96,
-						"w": 80,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 80,
+						"w": 87,
-						"h": 96
+						"h": 98
 					},
 					"spriteSourceSize": {
-						"x": 1,
+						"x": 5,
-						"y": 0,
+						"y": 2,
-						"w": 79,
+						"w": 81,
 						"h": 96
 					},
 					"frame": {
-						"x": 80,
+						"x": 0,
-						"y": 192,
+						"y": 98,
-						"w": 79,
+						"w": 81,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 79,
-						"h": 96
-					},
-					"frame": {
-						"x": 80,
-						"y": 288,
-						"w": 79,
 						"h": 96
 					}
 				},
@@ -308,251 +161,62 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 80,
+						"w": 87,
-						"h": 96
+						"h": 98
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 5,
-						"y": 1,
-						"w": 80,
-						"h": 95
-					},
-					"frame": {
-						"x": 159,
-						"y": 192,
-						"w": 80,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 80,
-						"h": 95
-					},
-					"frame": {
-						"x": 159,
-						"y": 192,
-						"w": 80,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 80,
-						"h": 95
-					},
-					"frame": {
-						"x": 160,
-						"y": 96,
-						"w": 80,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 80,
-						"h": 95
-					},
-					"frame": {
-						"x": 159,
-						"y": 287,
-						"w": 80,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 80,
-						"h": 95
-					},
-					"frame": {
-						"x": 240,
-						"y": 96,
-						"w": 80,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 80,
-						"h": 95
-					},
-					"frame": {
-						"x": 320,
-						"y": 96,
-						"w": 80,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 80,
-						"h": 95
-					},
-					"frame": {
-						"x": 239,
-						"y": 191,
-						"w": 80,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
 						"y": 2,
-						"w": 80,
+						"w": 81,
-						"h": 94
+						"h": 96
 					},
 					"frame": {
-						"x": 319,
+						"x": 0,
-						"y": 191,
+						"y": 98,
-						"w": 80,
+						"w": 81,
-						"h": 94
+						"h": 96
 					}
 				},
 				{
-					"filename": "0010.png",
+					"filename": "0006.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 80,
+						"w": 87,
-						"h": 96
+						"h": 98
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 6,
 						"y": 2,
-						"w": 80,
+						"w": 81,
-						"h": 94
+						"h": 96
 					},
 					"frame": {
-						"x": 319,
+						"x": 81,
-						"y": 285,
+						"y": 98,
-						"w": 80,
+						"w": 81,
-						"h": 94
+						"h": 96
 					}
 				},
 				{
-					"filename": "0021.png",
+					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 80,
+						"w": 87,
-						"h": 96
+						"h": 98
 					},
 					"spriteSourceSize": {
 						"x": 0,
-						"y": 2,
+						"y": 1,
 						"w": 80,
-						"h": 94
+						"h": 97
 					},
 					"frame": {
-						"x": 239,
+						"x": 162,
-						"y": 286,
+						"y": 98,
 						"w": 80,
-						"h": 94
+						"h": 97
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 80,
-						"h": 94
-					},
-					"frame": {
-						"x": 239,
-						"y": 380,
-						"w": 80,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 80,
-						"h": 94
-					},
-					"frame": {
-						"x": 319,
-						"y": 379,
-						"w": 80,
-						"h": 94
 					}
 				}
 			]
@@ -561,6 +225,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:0cea7db7c741e40193d7f7caa38b8e51:f7f798d7d644d2747b17e2fffa7fa283:f062a143efe7a1f42b82d0e5295ae76b$"
+		"smartupdate": "$TexturePacker:SmartUpdate:f3f63c4c8b91d25b294f6a6b954a36eb:2c999d295d87e9938aebe900dcdb566b:f062a143efe7a1f42b82d0e5295ae76b$"
 	}
 }

public/images/pokemon/exp/back/shiny/716-neutral.json

@@ -4,302 +4,155 @@
 			"image": "716-neutral.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 474,
+				"w": 242,
-				"h": 474
+				"h": 242
 			},
 			"scale": 1,
 			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 96
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 96
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 96
-					}
-				},
 				{
 					"filename": "0002.png",
 					"rotated": false,
-					"trimmed": false,
+					"trimmed": true,
 					"sourceSize": {
-						"w": 80,
+						"w": 87,
-						"h": 96
+						"h": 98
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 80,
+						"w": 81,
-						"h": 96
+						"h": 98
 					},
 					"frame": {
 						"x": 0,
-						"y": 96,
+						"y": 0,
-						"w": 80,
+						"w": 81,
-						"h": 96
+						"h": 98
 					}
 				},
 				{
-					"filename": "0014.png",
+					"filename": "0010.png",
 					"rotated": false,
-					"trimmed": false,
+					"trimmed": true,
 					"sourceSize": {
-						"w": 80,
+						"w": 87,
-						"h": 96
+						"h": 98
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 80,
+						"w": 81,
-						"h": 96
+						"h": 98
 					},
 					"frame": {
 						"x": 0,
-						"y": 96,
+						"y": 0,
-						"w": 80,
+						"w": 81,
-						"h": 96
+						"h": 98
 					}
 				},
 				{
 					"filename": "0003.png",
 					"rotated": false,
-					"trimmed": false,
+					"trimmed": true,
 					"sourceSize": {
-						"w": 80,
+						"w": 87,
-						"h": 96
+						"h": 98
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 3,
 						"y": 0,
 						"w": 80,
-						"h": 96
+						"h": 98
 					},
 					"frame": {
-						"x": 0,
+						"x": 81,
-						"y": 192,
+						"y": 0,
 						"w": 80,
-						"h": 96
+						"h": 98
+					}
+				},
+				{
+					"filename": "0009.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 87,
+						"h": 98
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
+						"w": 80,
+						"h": 98
+					},
+					"frame": {
+						"x": 81,
+						"y": 0,
+						"w": 80,
+						"h": 98
 					}
 				},
 				{
 					"filename": "0004.png",
 					"rotated": false,
-					"trimmed": false,
+					"trimmed": true,
 					"sourceSize": {
-						"w": 80,
+						"w": 87,
-						"h": 96
+						"h": 98
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 4,
 						"y": 0,
 						"w": 80,
-						"h": 96
+						"h": 98
 					},
 					"frame": {
-						"x": 0,
+						"x": 161,
-						"y": 288,
+						"y": 0,
 						"w": 80,
-						"h": 96
+						"h": 98
 					}
 				},
 				{
-					"filename": "0015.png",
+					"filename": "0008.png",
 					"rotated": false,
-					"trimmed": false,
+					"trimmed": true,
 					"sourceSize": {
-						"w": 80,
+						"w": 87,
-						"h": 96
+						"h": 98
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 4,
 						"y": 0,
 						"w": 80,
-						"h": 96
+						"h": 98
 					},
 					"frame": {
-						"x": 0,
+						"x": 161,
-						"y": 288,
+						"y": 0,
 						"w": 80,
-						"h": 96
+						"h": 98
 					}
 				},
 				{
 					"filename": "0005.png",
 					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 96
-					},
-					"frame": {
-						"x": 80,
-						"y": 0,
-						"w": 80,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 96
-					},
-					"frame": {
-						"x": 160,
-						"y": 0,
-						"w": 80,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 96
-					},
-					"frame": {
-						"x": 240,
-						"y": 0,
-						"w": 80,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 96
-					},
-					"frame": {
-						"x": 320,
-						"y": 0,
-						"w": 80,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 96
-					},
-					"frame": {
-						"x": 80,
-						"y": 96,
-						"w": 80,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 80,
+						"w": 87,
-						"h": 96
+						"h": 98
 					},
 					"spriteSourceSize": {
-						"x": 1,
+						"x": 5,
-						"y": 0,
+						"y": 2,
-						"w": 79,
+						"w": 81,
 						"h": 96
 					},
 					"frame": {
-						"x": 80,
+						"x": 0,
-						"y": 192,
+						"y": 98,
-						"w": 79,
+						"w": 81,
-						"h": 96
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 79,
-						"h": 96
-					},
-					"frame": {
-						"x": 80,
-						"y": 288,
-						"w": 79,
 						"h": 96
 					}
 				},
@@ -308,251 +161,62 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 80,
+						"w": 87,
-						"h": 96
+						"h": 98
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 5,
-						"y": 1,
-						"w": 80,
-						"h": 95
-					},
-					"frame": {
-						"x": 159,
-						"y": 192,
-						"w": 80,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 80,
-						"h": 95
-					},
-					"frame": {
-						"x": 159,
-						"y": 192,
-						"w": 80,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 80,
-						"h": 95
-					},
-					"frame": {
-						"x": 160,
-						"y": 96,
-						"w": 80,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 80,
-						"h": 95
-					},
-					"frame": {
-						"x": 159,
-						"y": 287,
-						"w": 80,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 80,
-						"h": 95
-					},
-					"frame": {
-						"x": 240,
-						"y": 96,
-						"w": 80,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 80,
-						"h": 95
-					},
-					"frame": {
-						"x": 320,
-						"y": 96,
-						"w": 80,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 80,
-						"h": 95
-					},
-					"frame": {
-						"x": 239,
-						"y": 191,
-						"w": 80,
-						"h": 95
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
 						"y": 2,
-						"w": 80,
+						"w": 81,
-						"h": 94
+						"h": 96
 					},
 					"frame": {
-						"x": 319,
+						"x": 0,
-						"y": 191,
+						"y": 98,
-						"w": 80,
+						"w": 81,
-						"h": 94
+						"h": 96
 					}
 				},
 				{
-					"filename": "0010.png",
+					"filename": "0006.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 80,
+						"w": 87,
-						"h": 96
+						"h": 98
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 6,
 						"y": 2,
-						"w": 80,
+						"w": 81,
-						"h": 94
+						"h": 96
 					},
 					"frame": {
-						"x": 319,
+						"x": 81,
-						"y": 285,
+						"y": 98,
-						"w": 80,
+						"w": 81,
-						"h": 94
+						"h": 96
 					}
 				},
 				{
-					"filename": "0021.png",
+					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 80,
+						"w": 87,
-						"h": 96
+						"h": 98
 					},
 					"spriteSourceSize": {
 						"x": 0,
-						"y": 2,
+						"y": 1,
 						"w": 80,
-						"h": 94
+						"h": 97
 					},
 					"frame": {
-						"x": 239,
+						"x": 162,
-						"y": 286,
+						"y": 98,
 						"w": 80,
-						"h": 94
+						"h": 97
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 80,
-						"h": 94
-					},
-					"frame": {
-						"x": 239,
-						"y": 380,
-						"w": 80,
-						"h": 94
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 80,
-						"h": 94
-					},
-					"frame": {
-						"x": 319,
-						"y": 379,
-						"w": 80,
-						"h": 94
 					}
 				}
 			]
@@ -561,6 +225,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:ec804991398117c2b88f689a4f1b5070:c1c4a6ceac8aee1d59b3c02be5ffea54:b0d2498f5e4efc35ed4c0e6948ad71f3$"
+		"smartupdate": "$TexturePacker:SmartUpdate:8269dc2444e752deb5924ecf90702eb7:2c999d295d87e9938aebe900dcdb566b:b0d2498f5e4efc35ed4c0e6948ad71f3$"
 	}
 }

public/images/pokemon/exp/shiny/716-neutral.json

@@ -1023,6 +1023,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:a0a16e01d8101930311b91d6623a0918:452ea2f0b385c76e75ace96da49c65c6:b0d2498f5e4efc35ed4c0e6948ad71f3$"
+		"smartupdate": "$TexturePacker:SmartUpdate:e87161792eb1bba2c892539c25079db0:e35d434a4b5c1af53502fca80b6b1837:b0d2498f5e4efc35ed4c0e6948ad71f3$"
 	}
 }