Merge branch 'beta' into keyboard-key-repeat-fix

.github/pull_request_template.md

@@ -1,37 +1,76 @@
-<!-- Make sure the title includes categorization (i.e. [Bug], [QoL], [Localization]) -->
-<!-- Make sure that this PR is not overlapping with someone else's work -->
-<!-- Please try to keep the PR self-contained (and small) -->
+<!-- (Once you have read these comments, you are free to remove them) -->
+<!-- Feel free to look at other PRs for examples -->
+<!--
+Make sure the title includes categorization (choose the one that best fits):
+-       [Bug]: If the PR is primarily a bug fix
+-      [Move]: If a move has new or changed functionality
+-   [Ability]: If an ability has new or changed functionality
+-      [Item]: For new or modified items
+-   [Mystery]: For new or modified Mystery Encounters
+-      [Test]: If the PR is primarily adding or modifying tests
+-     [UI/UX]: If the PR is changing UI/UX elements
+-     [Audio]: If the PR is adding or changing music/sfx
+-    [Sprite]: If the PR is adding or changing sprites
+-   [Balance]: If the PR is related to game balance
+- [Challenge]: If the PR is adding or modifying challenges
+-  [Refactor]: If the PR is primarily rewriting existing code
+-      [Docs]: If the PR is just adding or modifying documentation (such as tsdocs/code comments)
+-    [GitHub]: For changes to GitHub workflows/templates/etc
+-      [Misc]: If no other category fits the PR
+-->
+<!--
+Make sure that this PR is not overlapping with someone else's work
+Please try to keep the PR self-contained (and small)
+-->
 
 ## What are the changes the user will see?
 <!-- Summarize what are the changes from a user perspective on the application -->
 
 ## Why am I making these changes?
-<!-- Explain why you decided to introduce these changes -->
-<!-- Does it come from an issue or another PR? Please link it -->
-<!-- Explain why you believe this can enhance user experience -->
+<!--
+Explain why you decided to introduce these changes
+Does it come from an issue or another PR? Please link it
+Explain why you believe this can enhance user experience
+-->
+<!--
+If there are existing GitHub issues related to the PR that would be fixed,
+you can add "Fixes #[issue number]" (ie: "Fixes #1234") to link an issue to your PR
+so that it will automatically be closed when the PR is merged.
+-->
 
 ## What are the changes from a developer perspective?
-<!-- Explicitly state what are the changes introduced by the PR -->
-<!-- You can make use of a comparison between what was the state before and after your PR changes -->
+<!--
+Explicitly state what are the changes introduced by the PR
+You can make use of a comparison between what was the state before and after your PR changes
+Ex: What files have been changed? What classes/functions/variables/etc have been added or changed?
+-->
 
-### Screenshots/Videos
-<!-- If your change is changing anything on the user experience, please provide visual proofs of it -->
-<!-- Please take screenshots/videos before and after your changes, to show what is brought by this PR -->
+## Screenshots/Videos
+<!--
+If your changes are changing anything on the user experience, please provide visual proofs of it
+Please take screenshots/videos before and after your changes, to show what is brought by this PR
+-->
 
 ## How to test the changes?
-<!-- How can a reviewer test your changes once they check out on your branch? -->
-<!-- Did you just make use of the `src/overrides.ts` file? -->
-<!-- Did you introduce any automated tests? -->
-<!-- Do the reviewer need to do something special in order to test your change? -->
+<!--
+How can a reviewer test your changes once they check out on your branch?
+Did you make use of the `src/overrides.ts` file?
+Did you introduce any automated tests?
+Do the reviewers need to do something special in order to test your changes?
+-->
 
 ## Checklist
 - [ ] **I'm using `beta` as my base branch**
 - [ ] There is no overlap with another PR?
 - [ ] The PR is self-contained and cannot be split into smaller PRs?
 - [ ] Have I provided a clear explanation of the changes?
-- [ ] Have I considered writing automated tests for the issue?
-- [ ] If I have text, did I make it translatable and add a key in the English locale file(s)?
-- [ ] Have I tested the changes (manually)?
-    - [ ] Are all unit tests still passing? (`npm run test`)
-- [ ] Are the changes visual?
-  - [ ] Have I provided screenshots/videos of the changes?
+- [ ] Have I tested the changes manually?
+- [ ] Are all unit tests still passing? (`npm run test`)
+  - [ ] Have I created new automated tests (`npm run create-test`) or updated existing tests related to the PR's changes?
+- [ ] Have I provided screenshots/videos of the changes (if applicable)?
+  - [ ] Have I made sure that any UI change works for both UI themes (default and legacy)?
+
+Are there any localization additions or changes? If so:
+- [ ] Has a locales PR been created on the [locales](https://github.com/pagefaultgames/pokerogue-locales) repo?
+  - [ ] If so, please leave a link to it here: 
+- [ ] Has the translation team been contacted for proofreading/translation?

README.md

@@ -123,6 +123,7 @@ Check out [Github Issues](https://github.com/pagefaultgames/pokerogue/issues) to
   - Involuntary-Twitch
   - selstar
   - koda_want_to_sleep
+  - thedreadedden
 
 ### 🎨 Move Animations
   - Pokémon Reborn

global.d.ts

@@ -10,5 +10,5 @@ declare global {
    * 
    * To set up your own server in a test see `game_data.test.ts`
    */
-  var i18nServer: SetupServerApi;
+  var server: SetupServerApi;
 }

package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "pokemon-rogue-battle",
-	"version": "1.1.0",
+	"version": "1.2.2",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "pokemon-rogue-battle",
-			"version": "1.1.0",
+			"version": "1.2.2",
 			"hasInstallScript": true,
 			"dependencies": {
 				"@material/material-color-utilities": "^0.2.7",
@@ -16,6 +16,7 @@
 				"i18next-http-backend": "^2.6.1",
 				"i18next-korean-postposition-processor": "^1.0.0",
 				"json-stable-stringify": "^1.1.0",
+				"jszip": "^3.10.1",
 				"phaser": "^3.70.0",
 				"phaser3-rex-plugins": "^1.1.84"
 			},
@@ -2723,6 +2724,11 @@
 				"node": ">= 0.6"
 			}
 		},
+		"node_modules/core-util-is": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+			"integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
+		},
 		"node_modules/cross-fetch": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz",
@@ -4045,6 +4051,11 @@
 				"node": ">= 4"
 			}
 		},
+		"node_modules/immediate": {
+			"version": "3.0.6",
+			"resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+			"integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ=="
+		},
 		"node_modules/import-fresh": {
 			"version": "3.3.0",
 			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@@ -4072,6 +4083,11 @@
 				"node": ">=0.8.19"
 			}
 		},
+		"node_modules/inherits": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+		},
 		"node_modules/ini": {
 			"version": "4.1.1",
 			"resolved": "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz",
@@ -4481,6 +4497,17 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/jszip": {
+			"version": "3.10.1",
+			"resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
+			"integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
+			"dependencies": {
+				"lie": "~3.3.0",
+				"pako": "~1.0.2",
+				"readable-stream": "~2.3.6",
+				"setimmediate": "^1.0.5"
+			}
+		},
 		"node_modules/keyv": {
 			"version": "4.5.4",
 			"resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
@@ -4648,6 +4675,14 @@
 				"node": ">= 0.8.0"
 			}
 		},
+		"node_modules/lie": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
+			"integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
+			"dependencies": {
+				"immediate": "~3.0.5"
+			}
+		},
 		"node_modules/linkify-it": {
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz",
@@ -5237,6 +5272,11 @@
 			"dev": true,
 			"license": "BlueOak-1.0.0"
 		},
+		"node_modules/pako": {
+			"version": "1.0.11",
+			"resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+			"integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
+		},
 		"node_modules/papaparse": {
 			"version": "5.4.1",
 			"resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.4.1.tgz",
@@ -5485,6 +5525,11 @@
 				"node": ">= 0.8.0"
 			}
 		},
+		"node_modules/process-nextick-args": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+			"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+		},
 		"node_modules/prompts": {
 			"version": "2.4.2",
 			"resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
@@ -5551,6 +5596,25 @@
 				}
 			]
 		},
+		"node_modules/readable-stream": {
+			"version": "2.3.8",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+			"integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+			"dependencies": {
+				"core-util-is": "~1.0.0",
+				"inherits": "~2.0.3",
+				"isarray": "~1.0.0",
+				"process-nextick-args": "~2.0.0",
+				"safe-buffer": "~5.1.1",
+				"string_decoder": "~1.1.1",
+				"util-deprecate": "~1.0.1"
+			}
+		},
+		"node_modules/readable-stream/node_modules/isarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+			"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+		},
 		"node_modules/rechoir": {
 			"version": "0.8.0",
 			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
@@ -5741,6 +5805,11 @@
 				"tslib": "^2.1.0"
 			}
 		},
+		"node_modules/safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+		},
 		"node_modules/safe-regex": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-2.1.1.tgz",
@@ -5800,6 +5869,11 @@
 				"node": ">= 0.4"
 			}
 		},
+		"node_modules/setimmediate": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+			"integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="
+		},
 		"node_modules/shebang-command": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -5917,6 +5991,14 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/string_decoder": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+			"dependencies": {
+				"safe-buffer": "~5.1.0"
+			}
+		},
 		"node_modules/string-width": {
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
@@ -6473,6 +6555,11 @@
 				"requires-port": "^1.0.0"
 			}
 		},
+		"node_modules/util-deprecate": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+			"integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+		},
 		"node_modules/vite": {
 			"version": "5.4.8",
 			"resolved": "https://registry.npmjs.org/vite/-/vite-5.4.8.tgz",

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "pokemon-rogue-battle",
 	"private": true,
-	"version": "1.1.0",
+	"version": "1.2.2",
 	"type": "module",
 	"scripts": {
 		"start": "vite",
@@ -55,6 +55,7 @@
 		"i18next-http-backend": "^2.6.1",
 		"i18next-korean-postposition-processor": "^1.0.0",
 		"json-stable-stringify": "^1.1.0",
+		"jszip": "^3.10.1",
 		"phaser": "^3.70.0",
 		"phaser3-rex-plugins": "^1.1.84"
 	},

public/images/pokemon/47.json

@@ -1,776 +1,299 @@
-{
-	"textures": [
-		{
-			"image": "47.png", 
-			"format": "RGBA8888", 
-			"size": {
-				"w": 230, 
-				"h": 230
-			}, 
-			"scale": 1, 
-			"frames": [
-				{
-					"filename": "0009.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 6, 
-						"y": 12, 
-						"w": 56, 
-						"h": 49
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 0, 
-						"w": 56, 
-						"h": 49
-					}
-				}, 
-				{
-					"filename": "0010.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 6, 
-						"y": 12, 
-						"w": 56, 
-						"h": 49
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 0, 
-						"w": 56, 
-						"h": 49
-					}
-				}, 
-				{
-					"filename": "0027.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 12, 
-						"w": 62, 
-						"h": 51
-					}, 
-					"frame": {
-						"x": 56, 
-						"y": 0, 
-						"w": 62, 
-						"h": 51
-					}
-				}, 
-				{
-					"filename": "0028.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 12, 
-						"w": 62, 
-						"h": 51
-					}, 
-					"frame": {
-						"x": 56, 
-						"y": 0, 
-						"w": 62, 
-						"h": 51
-					}
-				}, 
-				{
-					"filename": "0007.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 7, 
-						"y": 8, 
-						"w": 55, 
-						"h": 53
-					}, 
-					"frame": {
-						"x": 118, 
-						"y": 0, 
-						"w": 55, 
-						"h": 53
-					}
-				}, 
-				{
-					"filename": "0008.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 7, 
-						"y": 8, 
-						"w": 55, 
-						"h": 53
-					}, 
-					"frame": {
-						"x": 118, 
-						"y": 0, 
-						"w": 55, 
-						"h": 53
-					}
-				}, 
-				{
-					"filename": "0011.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 7, 
-						"y": 7, 
-						"w": 55, 
-						"h": 54
-					}, 
-					"frame": {
-						"x": 173, 
-						"y": 0, 
-						"w": 55, 
-						"h": 54
-					}
-				}, 
-				{
-					"filename": "0012.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 7, 
-						"y": 7, 
-						"w": 55, 
-						"h": 54
-					}, 
-					"frame": {
-						"x": 173, 
-						"y": 0, 
-						"w": 55, 
-						"h": 54
-					}
-				}, 
-				{
-					"filename": "0005.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 8, 
-						"y": 5, 
-						"w": 53, 
-						"h": 56
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 49, 
-						"w": 53, 
-						"h": 56
-					}
-				}, 
-				{
-					"filename": "0006.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 8, 
-						"y": 5, 
-						"w": 53, 
-						"h": 56
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 49, 
-						"w": 53, 
-						"h": 56
-					}
-				}, 
-				{
-					"filename": "0025.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 8, 
-						"w": 62, 
-						"h": 55
-					}, 
-					"frame": {
-						"x": 53, 
-						"y": 51, 
-						"w": 62, 
-						"h": 55
-					}
-				}, 
-				{
-					"filename": "0026.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 8, 
-						"w": 62, 
-						"h": 55
-					}, 
-					"frame": {
-						"x": 53, 
-						"y": 51, 
-						"w": 62, 
-						"h": 55
-					}
-				}, 
-				{
-					"filename": "0013.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 8, 
-						"y": 4, 
-						"w": 53, 
-						"h": 57
-					}, 
-					"frame": {
-						"x": 115, 
-						"y": 53, 
-						"w": 53, 
-						"h": 57
-					}
-				}, 
-				{
-					"filename": "0014.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 8, 
-						"y": 4, 
-						"w": 53, 
-						"h": 57
-					}, 
-					"frame": {
-						"x": 115, 
-						"y": 53, 
-						"w": 53, 
-						"h": 57
-					}
-				}, 
-				{
-					"filename": "0029.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 7, 
-						"w": 62, 
-						"h": 56
-					}, 
-					"frame": {
-						"x": 168, 
-						"y": 54, 
-						"w": 62, 
-						"h": 56
-					}
-				}, 
-				{
-					"filename": "0030.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 7, 
-						"w": 62, 
-						"h": 56
-					}, 
-					"frame": {
-						"x": 168, 
-						"y": 54, 
-						"w": 62, 
-						"h": 56
-					}
-				}, 
-				{
-					"filename": "0023.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 5, 
-						"w": 61, 
-						"h": 58
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 106, 
-						"w": 61, 
-						"h": 58
-					}
-				}, 
-				{
-					"filename": "0024.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 5, 
-						"w": 61, 
-						"h": 58
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 106, 
-						"w": 61, 
-						"h": 58
-					}
-				}, 
-				{
-					"filename": "0003.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 6, 
-						"y": 2, 
-						"w": 54, 
-						"h": 59
-					}, 
-					"frame": {
-						"x": 61, 
-						"y": 106, 
-						"w": 54, 
-						"h": 59
-					}
-				}, 
-				{
-					"filename": "0004.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 6, 
-						"y": 2, 
-						"w": 54, 
-						"h": 59
-					}, 
-					"frame": {
-						"x": 61, 
-						"y": 106, 
-						"w": 54, 
-						"h": 59
-					}
-				}, 
+{ "frames": [
   {
     "filename": "0001.png",
+    "frame": { "x": 0, "y": 58, "w": 55, "h": 57 },
     "rotated": false,
     "trimmed": true,
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 2, 
-						"y": 2, 
-						"w": 57, 
-						"h": 59
-					}, 
-					"frame": {
-						"x": 115, 
-						"y": 110, 
-						"w": 57, 
-						"h": 59
-					}
+    "spriteSourceSize": { "x": 6, "y": 5, "w": 55, "h": 57 },
+    "sourceSize": { "w": 65, "h": 65 }
    },
    {
     "filename": "0002.png",
+    "frame": { "x": 0, "y": 58, "w": 55, "h": 57 },
     "rotated": false,
     "trimmed": true,
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 2, 
-						"y": 2, 
-						"w": 57, 
-						"h": 59
-					}, 
-					"frame": {
-						"x": 115, 
-						"y": 110, 
-						"w": 57, 
-						"h": 59
-					}
+    "spriteSourceSize": { "x": 6, "y": 5, "w": 55, "h": 57 },
+    "sourceSize": { "w": 65, "h": 65 }
    },
    {
-					"filename": "0019.png", 
+    "filename": "0003.png",
+    "frame": { "x": 166, "y": 114, "w": 52, "h": 56 },
     "rotated": false,
     "trimmed": true,
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 2, 
-						"y": 2, 
-						"w": 57, 
-						"h": 59
-					}, 
-					"frame": {
-						"x": 115, 
-						"y": 110, 
-						"w": 57, 
-						"h": 59
-					}
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 52, "h": 56 },
+    "sourceSize": { "w": 65, "h": 65 }
    },
    {
-					"filename": "0020.png", 
+    "filename": "0004.png",
+    "frame": { "x": 166, "y": 114, "w": 52, "h": 56 },
     "rotated": false,
     "trimmed": true,
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 52, "h": 56 },
+    "sourceSize": { "w": 65, "h": 65 }
    },
-					"spriteSourceSize": {
-						"x": 2, 
-						"y": 2, 
-						"w": 57, 
-						"h": 59
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 169, "w": 51, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 7, "w": 51, "h": 54 },
+    "sourceSize": { "w": 65, "h": 65 }
    },
-					"frame": {
-						"x": 115, 
-						"y": 110, 
-						"w": 57, 
-						"h": 59
-					}
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 169, "w": 51, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 7, "w": 51, "h": 54 },
+    "sourceSize": { "w": 65, "h": 65 }
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 104, "y": 166, "w": 53, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 9, "w": 53, "h": 52 },
+    "sourceSize": { "w": 65, "h": 65 }
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 104, "y": 166, "w": 53, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 9, "w": 53, "h": 52 },
+    "sourceSize": { "w": 65, "h": 65 }
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 157, "y": 170, "w": 55, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 12, "w": 55, "h": 49 },
+    "sourceSize": { "w": 65, "h": 65 }
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 157, "y": 170, "w": 55, "h": 49 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 9, "y": 12, "w": 55, "h": 49 },
+    "sourceSize": { "w": 65, "h": 65 }
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 115, "w": 53, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 8, "w": 53, "h": 54 },
+    "sourceSize": { "w": 65, "h": 65 }
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 0, "y": 115, "w": 53, "h": 54 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 8, "w": 53, "h": 54 },
+    "sourceSize": { "w": 65, "h": 65 }
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 53, "y": 116, "w": 51, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 6, "w": 51, "h": 56 },
+    "sourceSize": { "w": 65, "h": 65 }
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 53, "y": 116, "w": 51, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 6, "w": 51, "h": 56 },
+    "sourceSize": { "w": 65, "h": 65 }
    },
    {
     "filename": "0015.png",
+    "frame": { "x": 114, "y": 109, "w": 52, "h": 57 },
     "rotated": false,
     "trimmed": true,
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 6, 
-						"y": 2, 
-						"w": 54, 
-						"h": 59
-					}, 
-					"frame": {
-						"x": 172, 
-						"y": 110, 
-						"w": 54, 
-						"h": 59
-					}
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 52, "h": 57 },
+    "sourceSize": { "w": 65, "h": 65 }
    },
    {
     "filename": "0016.png",
+    "frame": { "x": 114, "y": 109, "w": 52, "h": 57 },
     "rotated": false,
     "trimmed": true,
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 6, 
-						"y": 2, 
-						"w": 54, 
-						"h": 59
-					}, 
-					"frame": {
-						"x": 172, 
-						"y": 110, 
-						"w": 54, 
-						"h": 59
-					}
-				}, 
-				{
-					"filename": "0031.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 4, 
-						"w": 61, 
-						"h": 59
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 164, 
-						"w": 61, 
-						"h": 59
-					}
-				}, 
-				{
-					"filename": "0032.png", 
-					"rotated": false, 
-					"trimmed": true, 
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 4, 
-						"w": 61, 
-						"h": 59
-					}, 
-					"frame": {
-						"x": 0, 
-						"y": 164, 
-						"w": 61, 
-						"h": 59
-					}
+    "spriteSourceSize": { "x": 9, "y": 5, "w": 52, "h": 57 },
+    "sourceSize": { "w": 65, "h": 65 }
    },
    {
     "filename": "0017.png",
+    "frame": { "x": 59, "y": 57, "w": 55, "h": 59 },
     "rotated": false,
     "trimmed": true,
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 2, 
-						"y": 0, 
-						"w": 57, 
-						"h": 61
-					}, 
-					"frame": {
-						"x": 61, 
-						"y": 169, 
-						"w": 57, 
-						"h": 61
-					}
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 55, "h": 59 },
+    "sourceSize": { "w": 65, "h": 65 }
    },
    {
     "filename": "0018.png",
+    "frame": { "x": 59, "y": 57, "w": 55, "h": 59 },
     "rotated": false,
     "trimmed": true,
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 2, 
-						"y": 0, 
-						"w": 57, 
-						"h": 61
-					}, 
-					"frame": {
-						"x": 61, 
-						"y": 169, 
-						"w": 57, 
-						"h": 61
-					}
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 55, "h": 59 },
+    "sourceSize": { "w": 65, "h": 65 }
    },
    {
-					"filename": "0035.png", 
+    "filename": "0019.png",
+    "frame": { "x": 0, "y": 58, "w": 55, "h": 57 },
     "rotated": false,
     "trimmed": true,
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 2, 
-						"y": 0, 
-						"w": 57, 
-						"h": 61
-					}, 
-					"frame": {
-						"x": 61, 
-						"y": 169, 
-						"w": 57, 
-						"h": 61
-					}
+    "spriteSourceSize": { "x": 6, "y": 5, "w": 55, "h": 57 },
+    "sourceSize": { "w": 65, "h": 65 }
    },
    {
-					"filename": "0036.png", 
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 58, "w": 55, "h": 57 },
     "rotated": false,
     "trimmed": true,
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 2, 
-						"y": 0, 
-						"w": 57, 
-						"h": 61
-					}, 
-					"frame": {
-						"x": 61, 
-						"y": 169, 
-						"w": 57, 
-						"h": 61
-					}
+    "spriteSourceSize": { "x": 6, "y": 5, "w": 55, "h": 57 },
+    "sourceSize": { "w": 65, "h": 65 }
    },
    {
     "filename": "0021.png",
+    "frame": { "x": 178, "y": 56, "w": 57, "h": 58 },
     "rotated": false,
     "trimmed": true,
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 2, 
-						"w": 60, 
-						"h": 61
-					}, 
-					"frame": {
-						"x": 118, 
-						"y": 169, 
-						"w": 60, 
-						"h": 61
-					}
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 57, "h": 58 },
+    "sourceSize": { "w": 65, "h": 65 }
    },
    {
     "filename": "0022.png",
+    "frame": { "x": 178, "y": 56, "w": 57, "h": 58 },
     "rotated": false,
     "trimmed": true,
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 57, "h": 58 },
+    "sourceSize": { "w": 65, "h": 65 }
    },
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 2, 
-						"w": 60, 
-						"h": 61
+   {
+    "filename": "0023.png",
+    "frame": { "x": 119, "y": 0, "w": 59, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 59, "h": 57 },
+    "sourceSize": { "w": 65, "h": 65 }
    },
-					"frame": {
-						"x": 118, 
-						"y": 169, 
-						"w": 60, 
-						"h": 61
-					}
+   {
+    "filename": "0024.png",
+    "frame": { "x": 119, "y": 0, "w": 59, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 7, "w": 59, "h": 57 },
+    "sourceSize": { "w": 65, "h": 65 }
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 178, "y": 0, "w": 60, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 60, "h": 56 },
+    "sourceSize": { "w": 65, "h": 65 }
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 178, "y": 0, "w": 60, "h": 56 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 9, "w": 60, "h": 56 },
+    "sourceSize": { "w": 65, "h": 65 }
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 114, "y": 57, "w": 62, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 62, "h": 52 },
+    "sourceSize": { "w": 65, "h": 65 }
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 114, "y": 57, "w": 62, "h": 52 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 2, "y": 12, "w": 62, "h": 52 },
+    "sourceSize": { "w": 65, "h": 65 }
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 59, "y": 0, "w": 60, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 60, "h": 57 },
+    "sourceSize": { "w": 65, "h": 65 }
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 59, "y": 0, "w": 60, "h": 57 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 8, "w": 60, "h": 57 },
+    "sourceSize": { "w": 65, "h": 65 }
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 0, "y": 0, "w": 59, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 59, "h": 58 },
+    "sourceSize": { "w": 65, "h": 65 }
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 0, "w": 59, "h": 58 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 3, "y": 6, "w": 59, "h": 58 },
+    "sourceSize": { "w": 65, "h": 65 }
    },
    {
     "filename": "0033.png",
+    "frame": { "x": 178, "y": 56, "w": 57, "h": 58 },
     "rotated": false,
     "trimmed": true,
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
-					}, 
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 2, 
-						"w": 60, 
-						"h": 61
-					}, 
-					"frame": {
-						"x": 118, 
-						"y": 169, 
-						"w": 60, 
-						"h": 61
-					}
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 57, "h": 58 },
+    "sourceSize": { "w": 65, "h": 65 }
    },
    {
     "filename": "0034.png",
+    "frame": { "x": 178, "y": 56, "w": 57, "h": 58 },
     "rotated": false,
     "trimmed": true,
-					"sourceSize": {
-						"w": 62, 
-						"h": 63
+    "spriteSourceSize": { "x": 4, "y": 5, "w": 57, "h": 58 },
+    "sourceSize": { "w": 65, "h": 65 }
    },
-					"spriteSourceSize": {
-						"x": 0, 
-						"y": 2, 
-						"w": 60, 
-						"h": 61
+   {
+    "filename": "0035.png",
+    "frame": { "x": 59, "y": 57, "w": 55, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 55, "h": 59 },
+    "sourceSize": { "w": 65, "h": 65 }
    },
-					"frame": {
-						"x": 118, 
-						"y": 169, 
-						"w": 60, 
-						"h": 61
-					}
-				}
-			]
+   {
+    "filename": "0036.png",
+    "frame": { "x": 59, "y": 57, "w": 55, "h": 59 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 6, "y": 3, "w": 55, "h": 59 },
+    "sourceSize": { "w": 65, "h": 65 }
    }
  ],
  "meta": {
-		"app": "https://www.codeandweb.com/texturepacker", 
-		"version": "3.0", 
-		"smartupdate": "$TexturePacker:SmartUpdate:b28fe643197bcc1def0e0ac2ba9f4e67:516d08c8e1ff13b49a109b082ef12860:fe45e2d628a6cef0908f7b82468c8798$"
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.8.1-x64",
+  "image": "47.png",
+  "format": "I8",
+  "size": { "w": 238, "h": 223 },
+  "scale": "1"
  }
 }