pull latest from main

2024-07-28 16:17:30 -04:00 · 2024-07-28 16:17:30 -04:00 · 5f3dc8a747
parent 8b10756644 8a883ea079
commit 5f3dc8a747
505 changed files with 28320 additions and 44494 deletions
--- a/.env
+++ b/.env
@ -1,3 +1,6 @@
 VITE_BYPASS_LOGIN=0
 VITE_BYPASS_TUTORIAL=0
-VITE_SERVER_URL=http://localhost:8001
+VITE_SERVER_URL=http://localhost:8001
+VITE_DISCORD_CLIENT_ID=1248062921129459756
+VITE_GOOGLE_CLIENT_ID=955345393540-2k6lfftf0fdnb0krqmpthjnqavfvvf73.apps.googleusercontent.com
+VITE_I18N_DEBUG=0
--- a/.env.beta
+++ b/.env.beta
@ -1,3 +1,6 @@
 VITE_BYPASS_LOGIN=0
 VITE_BYPASS_TUTORIAL=0
-VITE_SERVER_URL=https://api.beta.pokerogue.net
+VITE_SERVER_URL=https://api.beta.pokerogue.net
+VITE_DISCORD_CLIENT_ID=1248062921129459756
+VITE_GOOGLE_CLIENT_ID=955345393540-2k6lfftf0fdnb0krqmpthjnqavfvvf73.apps.googleusercontent.com
+VITE_I18N_DEBUG=1
--- a/.env.development
+++ b/.env.development
@ -1,3 +1,7 @@
 VITE_BYPASS_LOGIN=1
 VITE_BYPASS_TUTORIAL=0
-VITE_SERVER_URL=http://localhost:8001
+VITE_SERVER_URL=http://localhost:8001
+VITE_DISCORD_CLIENT_ID=1234567890
+VITE_GOOGLE_CLIENT_ID=1234567890
+VITE_I18N_DEBUG=1
+VITE_PORT=8000
--- a/.env.production
+++ b/.env.production
@ -1,3 +1,6 @@
 VITE_BYPASS_LOGIN=0
 VITE_BYPASS_TUTORIAL=0
-VITE_SERVER_URL=https://api.pokerogue.net
+VITE_SERVER_URL=https://api.pokerogue.net
+VITE_DISCORD_CLIENT_ID=1248062921129459756
+VITE_GOOGLE_CLIENT_ID=955345393540-2k6lfftf0fdnb0krqmpthjnqavfvvf73.apps.googleusercontent.com
+VITE_I18N_DEBUG=0
--- a/.env.test
+++ b/.env.test
@ -0,0 +1 @@
+VITE_I18N_DEBUG=0
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@ -1,7 +1,7 @@
 name: Bug Report
 description: Create a report to help us improve
 title: "[Bug] "
-labels: ["bug"]
+labels: ["Bug"]
 body:
  - type: markdown
    attributes:
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@ -25,6 +25,7 @@
 <!-- Do the reviewer need to do something special in order to test your change? -->

 ## 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?
--- a/.github/workflows/deploy-beta.yml
+++ b/.github/workflows/deploy-beta.yml
@ -1,8 +1,9 @@
 name: Deploy Beta

 on:
-  push: {}
-  pull_request: {}
+  push:
+    branches:
+      - beta

 jobs:
  deploy:
@ -20,7 +21,6 @@ jobs:
        env:
          NODE_ENV: production
      - name: Set up SSH
-        if: github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
        run: |
          mkdir ~/.ssh
          echo "${{ secrets.BETA_SSH_PUBLIC_KEY }}" > ~/.ssh/id_ed25519.pub
@ -28,6 +28,5 @@ jobs:
          chmod 600 ~/.ssh/*
          ssh-keyscan -H ${{ secrets.BETA_SSH_HOST }} >> ~/.ssh/known_hosts
      - name: Deploy build on server
-        if: github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
        run: | 
          rsync --del --no-times --checksum -vrm dist/* ${{ secrets.BETA_SSH_USER }}@${{ secrets.BETA_SSH_HOST }}:${{ secrets.BETA_DESTINATION_DIR }}
--- a/.github/workflows/eslint.yml
+++ b/.github/workflows/eslint.yml
@ -6,9 +6,11 @@ on:
  push:
    branches:
      - main  # Trigger on push events to the main branch
+      - beta # Trigger on push events to the beta branch
  pull_request:
    branches:
      - main  # Trigger on pull request events targeting the main branch
+      - beta # Trigger on pull request events targeting the beta branch

 jobs:
  run-linters:  # Define a job named "run-linters"
--- a/.github/workflows/github-pages.yml
+++ b/.github/workflows/github-pages.yml
@ -7,6 +7,7 @@ on:
  pull_request:
    branches:
      - main
+      - beta

 jobs:
  pages:
@ -52,7 +53,7 @@ jobs:
        working-directory: ${{env.api-dir}}
        run: |
          cd pokerogue_docs
-          npx typedoc --out /tmp/docs --githubPages false --entryPoints ./src/
+          npm run docs -- --out /tmp/docs --githubPages false --entryPoints ./src/

      - name: Commit & Push docs
        if: github.event_name == 'push'
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@ -6,9 +6,11 @@ on:
  push:
    branches:
      - main  # Trigger on push events to the main branch
+      - beta # Trigger on push events to the beta branch
  pull_request:
    branches:
      - main  # Trigger on pull request events targeting the main branch
+      - beta # Trigger on pull request events targeting the beta branch

 jobs:
  run-tests:  # Define a job named "run-tests"
--- a/.gitignore
+++ b/.gitignore
@ -39,4 +39,5 @@ coverage
 # Local Documentation
 /typedoc

-/dependency-graph.svg
+/dependency-graph.svg
+/.vs
--- a/README.md
+++ b/README.md
@ -1,10 +1,10 @@
 <picture><img src="./public/images/logo.png" width="300" alt="PokéRogue"></picture>

-PokéRogue is a browser based Pokémon fangame heavily inspired by the roguelite genre. Battle endlessly while gathering stacking items, exploring many different biomes, fighting trainers, bosses, and more! 
+PokéRogue is a browser based Pokémon fangame heavily inspired by the roguelite genre. Battle endlessly while gathering stacking items, exploring many different biomes, fighting trainers, bosses, and more!

 # Contributing
 ## 🛠️ Development
-If you have the motivation and experience with Typescript/Javascript (or are willing to learn) please feel free to fork the repository and make pull requests with contributions. If you don't know what to work on but want to help, reference the below **To-Do** section or the **#feature-vote** channel in the discord. 
+If you have the motivation and experience with Typescript/Javascript (or are willing to learn) please feel free to fork the repository and make pull requests with contributions. If you don't know what to work on but want to help, reference the below **To-Do** section or the **#feature-vote** channel in the discord.

 ### 💻 Environment Setup
 #### Prerequisites
@ -17,9 +17,9 @@ If you have the motivation and experience with Typescript/Javascript (or are wil
 2. Run `npm run start:dev` to locally run the project in `localhost:8000`

 #### Linting
-We're using ESLint as our common linter and formatter. It will run automatically during the pre-commit hook but if you would like to manually run it, use the `npm run eslint` script. 
+We're using ESLint as our common linter and formatter. It will run automatically during the pre-commit hook but if you would like to manually run it, use the `npm run eslint` script.

-### ❔ FAQ 
+### ❔ FAQ

 **How do I test a new _______?**
 - In the `src/overrides.ts` file there are overrides for most values you'll need to change for testing
@ -56,6 +56,7 @@ Check out [Github Issues](https://github.com/pagefaultgames/pokerogue/issues) to
  - Pokémon Scarlet/Violet
  - Firel (Custom Laboratory, Metropolis, Seabed, and Space biome music)
  - Lmz (Custom Jungle biome music)
+  - Andr06 (Custom Slum and Sea biome music)

 ### 🎵 Sound Effects
  - Pokémon Emerald
@ -111,6 +112,7 @@ Check out [Github Issues](https://github.com/pagefaultgames/pokerogue/issues) to
  - mangalos810
  - Involuntary-Twitch
  - selstar
+  - koda_want_to_sleep

 ### 🎨 Move Animations
  - Pokémon Reborn
--- a/package-lock.json
+++ b/package-lock.json
@ -35,8 +35,8 @@
 				"lefthook": "^1.6.12",
 				"phaser3spectorjs": "^0.0.8",
 				"pokenode-ts": "^1.20.0",
-				"typedoc": "^0.25.13",
-				"typescript": "^5.4.5",
+				"typedoc": "^0.26.4",
+				"typescript": "^5.5.3",
 				"typescript-eslint": "^7.10.0",
 				"vite": "^4.5.0",
 				"vite-plugin-fs": "^0.4.4",
@ -1179,6 +1179,16 @@
 				"win32"
 			]
 		},
+		"node_modules/@shikijs/core": {
+			"version": "1.10.3",
+			"resolved": "https://registry.npmjs.org/@shikijs/core/-/core-1.10.3.tgz",
+			"integrity": "sha512-D45PMaBaeDHxww+EkcDQtDAtzv00Gcsp72ukBtaLSmqRvh0WgGMq3Al0rl1QQBZfuneO75NXMIzEZGFitThWbg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/hast": "^3.0.4"
+			}
+		},
 		"node_modules/@sinclair/typebox": {
 			"version": "0.27.8",
 			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
@ -1191,6 +1201,16 @@
 			"integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
 			"dev": true
 		},
+		"node_modules/@types/hast": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
+			"integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/unist": "*"
+			}
+		},
 		"node_modules/@types/jsdom": {
 			"version": "21.1.7",
 			"resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-21.1.7.tgz",
@ -1220,6 +1240,13 @@
 			"resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz",
 			"integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA=="
 		},
+		"node_modules/@types/unist": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz",
+			"integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/@typescript-eslint/eslint-plugin": {
 			"version": "7.10.0",
 			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.10.0.tgz",
@ -1706,12 +1733,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/ansi-sequence-parser": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/ansi-sequence-parser/-/ansi-sequence-parser-1.1.1.tgz",
-			"integrity": "sha512-vJXt3yiaUL4UU546s3rPXlsry/RnM730G1+HkpKE012AN0sx1eOrxSu95oKDIonskeLTijMgqWZ3uDEe3NFvyg==",
-			"dev": true
-		},
 		"node_modules/ansi-styles": {
 			"version": "3.2.1",
 			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
@ -4614,12 +4635,6 @@
 				"node": ">=6"
 			}
 		},
-		"node_modules/jsonc-parser": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz",
-			"integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==",
-			"dev": true
-		},
 		"node_modules/jsonify": {
 			"version": "0.0.1",
 			"resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",
@ -4884,6 +4899,16 @@
 				"node": ">= 0.8.0"
 			}
 		},
+		"node_modules/linkify-it": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz",
+			"integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"uc.micro": "^2.0.0"
+			}
+		},
 		"node_modules/local-pkg": {
 			"version": "0.5.0",
 			"resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.5.0.tgz",
@ -4985,18 +5010,31 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/marked": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz",
-			"integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==",
+		"node_modules/markdown-it": {
+			"version": "14.1.0",
+			"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz",
+			"integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==",
 			"dev": true,
-			"bin": {
-				"marked": "bin/marked.js"
+			"license": "MIT",
+			"dependencies": {
+				"argparse": "^2.0.1",
+				"entities": "^4.4.0",
+				"linkify-it": "^5.0.0",
+				"mdurl": "^2.0.0",
+				"punycode.js": "^2.3.1",
+				"uc.micro": "^2.1.0"
 			},
-			"engines": {
-				"node": ">= 12"
+			"bin": {
+				"markdown-it": "bin/markdown-it.mjs"
 			}
 		},
+		"node_modules/mdurl": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz",
+			"integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/media-typer": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
@ -5725,6 +5763,16 @@
 				"node": ">=6"
 			}
 		},
+		"node_modules/punycode.js": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz",
+			"integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
 		"node_modules/qs": {
 			"version": "6.12.1",
 			"resolved": "https://registry.npmjs.org/qs/-/qs-6.12.1.tgz",
@ -6145,15 +6193,14 @@
 			}
 		},
 		"node_modules/shiki": {
-			"version": "0.14.7",
-			"resolved": "https://registry.npmjs.org/shiki/-/shiki-0.14.7.tgz",
-			"integrity": "sha512-dNPAPrxSc87ua2sKJ3H5dQ/6ZaY8RNnaAqK+t0eG7p0Soi2ydiqbGOTaZCqaYvA/uZYfS1LJnemt3Q+mSfcPCg==",
+			"version": "1.10.3",
+			"resolved": "https://registry.npmjs.org/shiki/-/shiki-1.10.3.tgz",
+			"integrity": "sha512-eneCLncGuvPdTutJuLyUGS8QNPAVFO5Trvld2wgEq1e002mwctAhJKeMGWtWVXOIEzmlcLRqcgPSorR6AVzOmQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"ansi-sequence-parser": "^1.1.0",
-				"jsonc-parser": "^3.2.0",
-				"vscode-oniguruma": "^1.7.0",
-				"vscode-textmate": "^8.0.0"
+				"@shikijs/core": "1.10.3",
+				"@types/hast": "^3.0.4"
 			}
 		},
 		"node_modules/side-channel": {
@ -6770,24 +6817,26 @@
 			}
 		},
 		"node_modules/typedoc": {
-			"version": "0.25.13",
-			"resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.25.13.tgz",
-			"integrity": "sha512-pQqiwiJ+Z4pigfOnnysObszLiU3mVLWAExSPf+Mu06G/qsc3wzbuM56SZQvONhHLncLUhYzOVkjFFpFfL5AzhQ==",
+			"version": "0.26.4",
+			"resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.26.4.tgz",
+			"integrity": "sha512-FlW6HpvULDKgc3rK04V+nbFyXogPV88hurarDPOjuuB5HAwuAlrCMQ5NeH7Zt68a/ikOKu6Z/0hFXAeC9xPccQ==",
 			"dev": true,
+			"license": "Apache-2.0",
 			"dependencies": {
 				"lunr": "^2.3.9",
-				"marked": "^4.3.0",
-				"minimatch": "^9.0.3",
-				"shiki": "^0.14.7"
+				"markdown-it": "^14.1.0",
+				"minimatch": "^9.0.5",
+				"shiki": "^1.9.1",
+				"yaml": "^2.4.5"
 			},
 			"bin": {
 				"typedoc": "bin/typedoc"
 			},
 			"engines": {
-				"node": ">= 16"
+				"node": ">= 18"
 			},
 			"peerDependencies": {
-				"typescript": "4.6.x || 4.7.x || 4.8.x || 4.9.x || 5.0.x || 5.1.x || 5.2.x || 5.3.x || 5.4.x"
+				"typescript": "4.6.x || 4.7.x || 4.8.x || 4.9.x || 5.0.x || 5.1.x || 5.2.x || 5.3.x || 5.4.x || 5.5.x"
 			}
 		},
 		"node_modules/typedoc/node_modules/brace-expansion": {
@ -6795,15 +6844,17 @@
 			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
 			"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"balanced-match": "^1.0.0"
 			}
 		},
 		"node_modules/typedoc/node_modules/minimatch": {
-			"version": "9.0.4",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
-			"integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
+			"version": "9.0.5",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+			"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
 				"brace-expansion": "^2.0.1"
 			},
@ -6815,10 +6866,11 @@
 			}
 		},
 		"node_modules/typescript": {
-			"version": "5.4.5",
-			"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
-			"integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
+			"version": "5.5.3",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz",
+			"integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==",
 			"dev": true,
+			"license": "Apache-2.0",
 			"bin": {
 				"tsc": "bin/tsc",
 				"tsserver": "bin/tsserver"
@ -6853,6 +6905,13 @@
 				}
 			}
 		},
+		"node_modules/uc.micro": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz",
+			"integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/ufo": {
 			"version": "1.5.3",
 			"resolved": "https://registry.npmjs.org/ufo/-/ufo-1.5.3.tgz",
@ -8162,18 +8221,6 @@
 				}
 			}
 		},
-		"node_modules/vscode-oniguruma": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz",
-			"integrity": "sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==",
-			"dev": true
-		},
-		"node_modules/vscode-textmate": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-8.0.0.tgz",
-			"integrity": "sha512-AFbieoL7a5LMqcnOF04ji+rpXadgOXnZsxQr//r83kLPr7biP7am3g9zbaZIaBGwBRWeSvoMD4mgPdX3e4NWBg==",
-			"dev": true
-		},
 		"node_modules/w3c-xmlserializer": {
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz",
@ -8414,6 +8461,19 @@
 			"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
 			"dev": true
 		},
+		"node_modules/yaml": {
+			"version": "2.4.5",
+			"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.5.tgz",
+			"integrity": "sha512-aBx2bnqDzVOyNKfsysjA2ms5ZlnjSAW2eG3/L5G/CSujfjLJTJsEw1bGw8kCf04KodQWk1pxlGnZ56CRxiawmg==",
+			"dev": true,
+			"license": "ISC",
+			"bin": {
+				"yaml": "bin.mjs"
+			},
+			"engines": {
+				"node": ">= 14"
+			}
+		},
 		"node_modules/yargs": {
 			"version": "17.7.2",
 			"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
--- a/package.json
+++ b/package.json
@ -9,10 +9,10 @@
 		"build": "vite build",
 		"build:beta": "vite build --mode beta",
 		"preview": "vite preview",
-		"test": "vitest run",
-		"test:cov": "vitest run --coverage",
-		"test:watch": "vitest watch --coverage",
-		"test:silent": "vitest run --silent",
+		"test": "vitest run --project pre && vitest run --project main",
+		"test:cov": "vitest run --project pre && vitest run --project main --coverage",
+		"test:watch": "vitest run --project pre && vitest watch --project main --coverage",
+		"test:silent": "vitest run --project pre && vitest run --project main --silent",
 		"eslint": "eslint --fix .",
 		"eslint-ci": "eslint .",
 		"docs": "typedoc",
@ -34,8 +34,8 @@
 		"lefthook": "^1.6.12",
 		"phaser3spectorjs": "^0.0.8",
 		"pokenode-ts": "^1.20.0",
-		"typedoc": "^0.25.13",
-		"typescript": "^5.4.5",
+		"typedoc": "^0.26.4",
+		"typescript": "^5.5.3",
 		"typescript-eslint": "^7.10.0",
 		"vite": "^4.5.0",
 		"vite-plugin-fs": "^0.4.4",
--- a/public/audio/bgm/battle_rival.mp3
+++ b/public/audio/bgm/battle_rival.mp3
--- a/public/audio/bgm/sea.mp3
+++ b/public/audio/bgm/sea.mp3
--- a/public/audio/bgm/slum.mp3
+++ b/public/audio/bgm/slum.mp3
--- a/public/battle-anims/muddy-water.json
+++ b/public/battle-anims/muddy-water.json
--- a/public/battle-anims/sludge-wave.json
+++ b/public/battle-anims/sludge-wave.json
@ -1149,202 +1149,6 @@
          "focus": 1
        }
      ],
-      [
-        {
-          "x": 0,
-          "y": 0,
-          "zoomX": 100,
-          "zoomY": 100,
-          "visible": true,
-          "target": 0,
-          "graphicFrame": 0,
-          "opacity": 255,
-          "locked": true,
-          "priority": 1,
-          "focus": 2
-        },
-        {
-          "x": 128,
-          "y": -64,
-          "zoomX": 100,
-          "zoomY": 100,
-          "visible": true,
-          "target": 1,
-          "graphicFrame": 0,
-          "opacity": 255,
-          "locked": true,
-          "priority": 1,
-          "focus": 1
-        }
-      ],
-      [
-        {
-          "x": 0,
-          "y": 0,
-          "zoomX": 100,
-          "zoomY": 100,
-          "visible": true,
-          "target": 0,
-          "graphicFrame": 0,
-          "opacity": 255,
-          "locked": true,
-          "priority": 1,
-          "focus": 2
-        },
-        {
-          "x": 128,
-          "y": -64,
-          "zoomX": 100,
-          "zoomY": 100,
-          "visible": true,
-          "target": 1,
-          "graphicFrame": 0,
-          "opacity": 255,
-          "locked": true,
-          "priority": 1,
-          "focus": 1
-        }
-      ],
-      [
-        {
-          "x": 0,
-          "y": 0,
-          "zoomX": 100,
-          "zoomY": 100,
-          "visible": true,
-          "target": 0,
-          "graphicFrame": 0,
-          "opacity": 255,
-          "locked": true,
-          "priority": 1,
-          "focus": 2
-        },
-        {
-          "x": 128,
-          "y": -64,
-          "zoomX": 100,
-          "zoomY": 100,
-          "visible": true,
-          "target": 1,
-          "graphicFrame": 0,
-          "opacity": 255,
-          "locked": true,
-          "priority": 1,
-          "focus": 1
-        }
-      ],
-      [
-        {
-          "x": 0,
-          "y": 0,
-          "zoomX": 100,
-          "zoomY": 100,
-          "visible": true,
-          "target": 0,
-          "graphicFrame": 0,
-          "opacity": 255,
-          "locked": true,
-          "priority": 1,
-          "focus": 2
-        },
-        {
-          "x": 128,
-          "y": -64,
-          "zoomX": 100,
-          "zoomY": 100,
-          "visible": true,
-          "target": 1,
-          "graphicFrame": 0,
-          "opacity": 255,
-          "locked": true,
-          "priority": 1,
-          "focus": 1
-        }
-      ],
-      [
-        {
-          "x": 0,
-          "y": 0,
-          "zoomX": 100,
-          "zoomY": 100,
-          "visible": true,
-          "target": 0,
-          "graphicFrame": 0,
-          "opacity": 255,
-          "locked": true,
-          "priority": 1,
-          "focus": 2
-        },
-        {
-          "x": 128,
-          "y": -64,
-          "zoomX": 100,
-          "zoomY": 100,
-          "visible": true,
-          "target": 1,
-          "graphicFrame": 0,
-          "opacity": 255,
-          "locked": true,
-          "priority": 1,
-          "focus": 1
-        }
-      ],
-      [
-        {
-          "x": 0,
-          "y": 0,
-          "zoomX": 100,
-          "zoomY": 100,
-          "visible": true,
-          "target": 0,
-          "graphicFrame": 0,
-          "opacity": 255,
-          "locked": true,
-          "priority": 1,
-          "focus": 2
-        },
-        {
-          "x": 128,
-          "y": -64,
-          "zoomX": 100,
-          "zoomY": 100,
-          "visible": true,
-          "target": 1,
-          "graphicFrame": 0,
-          "opacity": 255,
-          "locked": true,
-          "priority": 1,
-          "focus": 1
-        }
-      ],
-      [
-        {
-          "x": 0,
-          "y": 0,
-          "zoomX": 100,
-          "zoomY": 100,
-          "visible": true,
-          "target": 0,
-          "graphicFrame": 0,
-          "opacity": 255,
-          "locked": true,
-          "priority": 1,
-          "focus": 2
-        },
-        {
-          "x": 128,
-          "y": -64,
-          "zoomX": 100,
-          "zoomY": 100,
-          "visible": true,
-          "target": 1,
-          "graphicFrame": 0,
-          "opacity": 255,
-          "locked": true,
-          "priority": 1,
-          "focus": 1
-        }
-      ],
      [
        {
          "x": 0,
@ -1382,6 +1186,41 @@
          "volume": 100,
          "pitch": 100,
          "eventType": "AnimTimedSoundEvent"
+        },
+        {
+          "frameIndex": 0,
+          "resourceName": "PRAS- Sludge Wave FG",
+          "bgX": -10,
+          "bgY": 365,
+          "opacity": 0,
+          "duration": 2,
+          "eventType": "AnimTimedAddBgEvent"
+        },
+        {
+          "frameIndex": 0,
+          "resourceName": "",
+          "bgX": 400,
+          "bgY": 340,
+          "duration": 45,
+          "eventType": "AnimTimedUpdateBgEvent"
+        }
+      ],
+      "1": [
+        {
+          "frameIndex": 1,
+          "resourceName": "",
+          "opacity": 200,
+          "duration": 6,
+          "eventType": "AnimTimedUpdateBgEvent"
+        }
+      ],
+      "30": [
+        {
+          "frameIndex": 30,
+          "resourceName": "",
+          "opacity": 0,
+          "duration": 15,
+          "eventType": "AnimTimedUpdateBgEvent"
        }
      ]
    },
@ -2538,202 +2377,6 @@
          "focus": 1
        }
      ],
-      [
-        {
-          "x": 0,
-          "y": 0,
-          "zoomX": 100,
-          "zoomY": 100,
-          "visible": true,
-          "target": 0,
-          "graphicFrame": 0,
-          "opacity": 255,
-          "locked": true,
-          "priority": 1,
-          "focus": 2
-        },
-        {
-          "x": 128,
-          "y": -64,
-          "zoomX": 100,
-          "zoomY": 100,
-          "visible": true,
-          "target": 1,
-          "graphicFrame": 0,
-          "opacity": 255,
-          "locked": true,
-          "priority": 1,
-          "focus": 1
-        }
-      ],
-      [
-        {
-          "x": 0,
-          "y": 0,
-          "zoomX": 100,
-          "zoomY": 100,
-          "visible": true,
-          "target": 0,
-          "graphicFrame": 0,
-          "opacity": 255,
-          "locked": true,
-          "priority": 1,
-          "focus": 2
-        },
-        {
-          "x": 128,
-          "y": -64,
-          "zoomX": 100,
-          "zoomY": 100,
-          "visible": true,
-          "target": 1,
-          "graphicFrame": 0,
-          "opacity": 255,
-          "locked": true,
-          "priority": 1,
-          "focus": 1
-        }
-      ],
-      [
-        {
-          "x": 0,
-          "y": 0,
-          "zoomX": 100,
-          "zoomY": 100,
-          "visible": true,
-          "target": 0,
-          "graphicFrame": 0,
-          "opacity": 255,
-          "locked": true,
-          "priority": 1,
-          "focus": 2
-        },
-        {
-          "x": 128,
-          "y": -64,
-          "zoomX": 100,
-          "zoomY": 100,
-          "visible": true,
-          "target": 1,
-          "graphicFrame": 0,
-          "opacity": 255,
-          "locked": true,
-          "priority": 1,
-          "focus": 1
-        }
-      ],
-      [
-        {
-          "x": 0,
-          "y": 0,
-          "zoomX": 100,
-          "zoomY": 100,
-          "visible": true,
-          "target": 0,
-          "graphicFrame": 0,
-          "opacity": 255,
-          "locked": true,
-          "priority": 1,
-          "focus": 2
-        },
-        {
-          "x": 128,
-          "y": -64,
-          "zoomX": 100,
-          "zoomY": 100,
-          "visible": true,
-          "target": 1,
-          "graphicFrame": 0,
-          "opacity": 255,
-          "locked": true,
-          "priority": 1,
-          "focus": 1
-        }
-      ],
-      [
-        {
-          "x": 0,
-          "y": 0,
-          "zoomX": 100,
-          "zoomY": 100,
-          "visible": true,
-          "target": 0,
-          "graphicFrame": 0,
-          "opacity": 255,
-          "locked": true,
-          "priority": 1,
-          "focus": 2
-        },
-        {
-          "x": 128,
-          "y": -64,
-          "zoomX": 100,
-          "zoomY": 100,
-          "visible": true,
-          "target": 1,
-          "graphicFrame": 0,
-          "opacity": 255,
-          "locked": true,
-          "priority": 1,
-          "focus": 1
-        }
-      ],
-      [
-        {
-          "x": 0,
-          "y": 0,
-          "zoomX": 100,
-          "zoomY": 100,
-          "visible": true,
-          "target": 0,
-          "graphicFrame": 0,
-          "opacity": 255,
-          "locked": true,
-          "priority": 1,
-          "focus": 2
-        },
-        {
-          "x": 128,
-          "y": -64,
-          "zoomX": 100,
-          "zoomY": 100,
-          "visible": true,
-          "target": 1,
-          "graphicFrame": 0,
-          "opacity": 255,
-          "locked": true,
-          "priority": 1,
-          "focus": 1
-        }
-      ],
-      [
-        {
-          "x": 0,
-          "y": 0,
-          "zoomX": 100,
-          "zoomY": 100,
-          "visible": true,
-          "target": 0,
-          "graphicFrame": 0,
-          "opacity": 255,
-          "locked": true,
-          "priority": 1,
-          "focus": 2
-        },
-        {
-          "x": 128,
-          "y": -64,
-          "zoomX": 100,
-          "zoomY": 100,
-          "visible": true,
-          "target": 1,
-          "graphicFrame": 0,
-          "opacity": 255,
-          "locked": true,
-          "priority": 1,
-          "focus": 1
-        }
-      ],
      [
        {
          "x": 0,
@ -2771,10 +2414,45 @@
          "volume": 100,
          "pitch": 100,
          "eventType": "AnimTimedSoundEvent"
+        },
+        {
+          "frameIndex": 0,
+          "resourceName": "PRAS- Sludge Wave FG Opp",
+          "bgX": -50,
+          "bgY": 0,
+          "opacity": 0,
+          "duration": 2,
+          "eventType": "AnimTimedAddBgEvent"
+        },
+        {
+          "frameIndex": 0,
+          "resourceName": "",
+          "bgX": -600,
+          "bgY": 200,
+          "duration": 45,
+          "eventType": "AnimTimedUpdateBgEvent"
+        }
+      ],
+      "1": [
+        {
+          "frameIndex": 1,
+          "resourceName": "",
+          "opacity": 200,
+          "duration": 6,
+          "eventType": "AnimTimedUpdateBgEvent"
+        }
+      ],
+      "30": [
+        {
+          "frameIndex": 30,
+          "resourceName": "",
+          "opacity": 0,
+          "duration": 15,
+          "eventType": "AnimTimedUpdateBgEvent"
        }
      ]
    },
    "position": 4,
    "hue": 0
  }
-]
+]
--- a/public/battle-anims/surf.json
+++ b/public/battle-anims/surf.json
@ -1186,6 +1186,41 @@
          "volume": 100,
          "pitch": 100,
          "eventType": "AnimTimedSoundEvent"
+        },
+        {
+          "frameIndex": 0,
+          "resourceName": "PRAS- Surf FG",
+          "bgX": -10,
+          "bgY": 365,
+          "opacity": 0,
+          "duration": 2,
+          "eventType": "AnimTimedAddBgEvent"
+        },
+        {
+          "frameIndex": 0,
+          "resourceName": "",
+          "bgX": 400,
+          "bgY": 340,
+          "duration": 45,
+          "eventType": "AnimTimedUpdateBgEvent"
+        }
+      ],
+      "1": [
+          {
+          "frameIndex": 1,
+          "resourceName": "",
+          "opacity": 200,
+          "duration": 6,
+          "eventType": "AnimTimedUpdateBgEvent"
+        }
+      ],
+      "30": [
+        {
+          "frameIndex": 30,
+          "resourceName": "",
+          "opacity": 0,
+          "duration": 15,
+          "eventType": "AnimTimedUpdateBgEvent"
        }
      ]
    },
@ -2379,10 +2414,45 @@
          "volume": 100,
          "pitch": 100,
          "eventType": "AnimTimedSoundEvent"
+        },
+        {
+          "frameIndex": 0,
+          "resourceName": "PRAS- Surf FG Opp - Copie",
+          "bgX": -50,
+          "bgY": 0,
+          "opacity": 0,
+          "duration": 2,
+          "eventType": "AnimTimedAddBgEvent"
+        },
+        {
+          "frameIndex": 0,
+          "resourceName": "",
+          "bgX": -600,
+          "bgY": 200,
+          "duration": 45,
+          "eventType": "AnimTimedUpdateBgEvent"
+        }
+      ],
+      "1": [
+        {
+          "frameIndex": 1,
+          "resourceName": "",
+          "opacity": 200,
+          "duration": 6,
+          "eventType": "AnimTimedUpdateBgEvent"
+        }
+      ],
+      "30": [
+        {
+          "frameIndex": 30,
+          "resourceName": "",
+          "opacity": 0,
+          "duration": 15,
+          "eventType": "AnimTimedUpdateBgEvent"
        }
      ]
    },
    "position": 4,
    "hue": 0
  }
-]
+]
--- a/public/images/items.json
+++ b/public/images/items.json
--- a/public/images/items.png
+++ b/public/images/items.png
--- a/public/images/items/baton.png
+++ b/public/images/items/baton.png
--- a/public/images/items/stick.png
+++ b/public/images/items/stick.png
--- a/public/images/items/power_herb.png
+++ b/public/images/items/power_herb.png
--- a/public/images/items/ribbon-gen1.png
+++ b/public/images/items/ribbon-gen1.png
--- a/public/images/items/ribbon-gen2.png
+++ b/public/images/items/ribbon-gen2.png
--- a/public/images/items/ribbon-gen3.png
+++ b/public/images/items/ribbon-gen3.png
--- a/public/images/items/ribbon-gen4.png
+++ b/public/images/items/ribbon-gen4.png
--- a/public/images/items/ribbon-gen5.png
+++ b/public/images/items/ribbon-gen5.png
--- a/public/images/items/ribbon-gen6.png
+++ b/public/images/items/ribbon-gen6.png
--- a/public/images/items/ribbon-gen7.png
+++ b/public/images/items/ribbon-gen7.png
--- a/public/images/items/ribbon-gen8.png
+++ b/public/images/items/ribbon-gen8.png
--- a/public/images/items/ribbon-gen9.png
+++ b/public/images/items/ribbon-gen9.png
--- a/public/images/items/ribbon_gen1.png
+++ b/public/images/items/ribbon_gen1.png
--- a/public/images/items/ribbon_gen2.png
+++ b/public/images/items/ribbon_gen2.png
--- a/public/images/items/ribbon_gen3.png
+++ b/public/images/items/ribbon_gen3.png
--- a/public/images/items/ribbon_gen4.png
+++ b/public/images/items/ribbon_gen4.png
--- a/public/images/items/ribbon_gen5.png
+++ b/public/images/items/ribbon_gen5.png
--- a/public/images/items/ribbon_gen6.png
+++ b/public/images/items/ribbon_gen6.png
--- a/public/images/items/ribbon_gen7.png
+++ b/public/images/items/ribbon_gen7.png
--- a/public/images/items/ribbon_gen8.png
+++ b/public/images/items/ribbon_gen8.png
--- a/public/images/items/ribbon_gen9.png
+++ b/public/images/items/ribbon_gen9.png
--- a/public/images/items/white_herb.png
+++ b/public/images/items/white_herb.png
--- a/public/images/pokemon/563.json
+++ b/public/images/pokemon/563.json
--- a/public/images/pokemon/563.png
+++ b/public/images/pokemon/563.png
--- a/public/images/pokemon/636.json
+++ b/public/images/pokemon/636.json
--- a/public/images/pokemon/636.png
+++ b/public/images/pokemon/636.png
--- a/public/images/pokemon/802-zenith.png
+++ b/public/images/pokemon/802-zenith.png
--- a/public/images/pokemon/back/186.json
+++ b/public/images/pokemon/back/186.json
--- a/public/images/pokemon/back/186.png
+++ b/public/images/pokemon/back/186.png
--- a/public/images/pokemon/back/700.png
+++ b/public/images/pokemon/back/700.png
--- a/public/images/pokemon/back/802-zenith.png
+++ b/public/images/pokemon/back/802-zenith.png
--- a/public/images/pokemon/back/female/186.json
+++ b/public/images/pokemon/back/female/186.json
--- a/public/images/pokemon/back/female/186.png
+++ b/public/images/pokemon/back/female/186.png
--- a/public/images/pokemon/back/shiny/186.json
+++ b/public/images/pokemon/back/shiny/186.json
--- a/public/images/pokemon/back/shiny/186.png
+++ b/public/images/pokemon/back/shiny/186.png
--- a/public/images/pokemon/back/shiny/715.png
+++ b/public/images/pokemon/back/shiny/715.png
--- a/public/images/pokemon/back/shiny/802-zenith.png
+++ b/public/images/pokemon/back/shiny/802-zenith.png
--- a/public/images/pokemon/back/shiny/982-three-segment.png
+++ b/public/images/pokemon/back/shiny/982-three-segment.png
--- a/public/images/pokemon/back/shiny/982.png
+++ b/public/images/pokemon/back/shiny/982.png
--- a/public/images/pokemon/back/shiny/female/186.json
+++ b/public/images/pokemon/back/shiny/female/186.json
--- a/public/images/pokemon/back/shiny/female/186.png
+++ b/public/images/pokemon/back/shiny/female/186.png
--- a/public/images/pokemon/exp/380-mega.png
+++ b/public/images/pokemon/exp/380-mega.png
--- a/public/images/pokemon/exp/381-mega.png
+++ b/public/images/pokemon/exp/381-mega.png
--- a/public/images/pokemon/exp/823.png
+++ b/public/images/pokemon/exp/823.png
--- a/public/images/pokemon/exp/back/150-mega-x.png
+++ b/public/images/pokemon/exp/back/150-mega-x.png
--- a/public/images/pokemon/exp/back/823.png
+++ b/public/images/pokemon/exp/back/823.png
--- a/public/images/pokemon/exp/back/shiny/150-mega-x.png
+++ b/public/images/pokemon/exp/back/shiny/150-mega-x.png
--- a/public/images/pokemon/exp/back/shiny/823.png
+++ b/public/images/pokemon/exp/back/shiny/823.png
--- a/public/images/pokemon/exp/female/916.json
+++ b/public/images/pokemon/exp/female/916.json
@ -1,272 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "916.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 250,
-				"h": 250
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 61,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 85
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 60,
-						"h": 85
-					},
-					"frame": {
-						"x": 0,
-						"y": 85,
-						"w": 60,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 5,
-						"w": 60,
-						"h": 80
-					},
-					"frame": {
-						"x": 0,
-						"y": 170,
-						"w": 60,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 60,
-						"h": 85
-					},
-					"frame": {
-						"x": 60,
-						"y": 85,
-						"w": 60,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 60,
-						"h": 85
-					},
-					"frame": {
-						"x": 61,
-						"y": 0,
-						"w": 60,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 5,
-						"w": 59,
-						"h": 80
-					},
-					"frame": {
-						"x": 60,
-						"y": 170,
-						"w": 59,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 60,
-						"h": 79
-					},
-					"frame": {
-						"x": 119,
-						"y": 170,
-						"w": 60,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 60,
-						"h": 85
-					},
-					"frame": {
-						"x": 120,
-						"y": 85,
-						"w": 60,
-						"h": 85
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 60,
-						"h": 83
-					},
-					"frame": {
-						"x": 121,
-						"y": 0,
-						"w": 60,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 60,
-						"h": 83
-					},
-					"frame": {
-						"x": 181,
-						"y": 0,
-						"w": 60,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 60,
-						"h": 81
-					},
-					"frame": {
-						"x": 180,
-						"y": 83,
-						"w": 60,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 85
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 4,
-						"w": 59,
-						"h": 81
-					},
-					"frame": {
-						"x": 180,
-						"y": 164,
-						"w": 59,
-						"h": 81
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:08f91248c91e426c4993be4e9988fc0d:215799a2235190ac587b1617d8e7e8b9:72483d103fb6b8e5c1889150025102c8$"
-	}
-}
--- a/public/images/pokemon/exp/female/916.png
+++ b/public/images/pokemon/exp/female/916.png
--- a/public/images/pokemon/exp/shiny/823.png
+++ b/public/images/pokemon/exp/shiny/823.png
--- a/public/images/pokemon/female/6215.png
+++ b/public/images/pokemon/female/6215.png
--- a/public/images/pokemon/female/916.json
+++ b/public/images/pokemon/female/916.json
@ -1,272 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "916.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 251,
-				"h": 251
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 13,
-						"y": 10,
-						"w": 62,
-						"h": 86
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 62,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 10,
-						"w": 61,
-						"h": 86
-					},
-					"frame": {
-						"x": 62,
-						"y": 0,
-						"w": 61,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 10,
-						"w": 61,
-						"h": 86
-					},
-					"frame": {
-						"x": 123,
-						"y": 0,
-						"w": 61,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 10,
-						"w": 60,
-						"h": 86
-					},
-					"frame": {
-						"x": 184,
-						"y": 0,
-						"w": 60,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 15,
-						"w": 61,
-						"h": 81
-					},
-					"frame": {
-						"x": 0,
-						"y": 86,
-						"w": 61,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 16,
-						"w": 61,
-						"h": 80
-					},
-					"frame": {
-						"x": 61,
-						"y": 86,
-						"w": 61,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 10,
-						"w": 60,
-						"h": 86
-					},
-					"frame": {
-						"x": 122,
-						"y": 86,
-						"w": 60,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 13,
-						"w": 60,
-						"h": 83
-					},
-					"frame": {
-						"x": 61,
-						"y": 166,
-						"w": 60,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 13,
-						"w": 60,
-						"h": 83
-					},
-					"frame": {
-						"x": 0,
-						"y": 167,
-						"w": 60,
-						"h": 83
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 15,
-						"y": 17,
-						"w": 60,
-						"h": 79
-					},
-					"frame": {
-						"x": 121,
-						"y": 172,
-						"w": 60,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 15,
-						"w": 60,
-						"h": 81
-					},
-					"frame": {
-						"x": 182,
-						"y": 86,
-						"w": 60,
-						"h": 81
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 96,
-						"h": 96
-					},
-					"spriteSourceSize": {
-						"x": 16,
-						"y": 16,
-						"w": 60,
-						"h": 80
-					},
-					"frame": {
-						"x": 182,
-						"y": 167,
-						"w": 60,
-						"h": 80
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:f1919e76120351b77d053dd0b1048890:6cc484548a07e592b87dcc37f6c74a39:72483d103fb6b8e5c1889150025102c8$"
-	}
-}
--- a/public/images/pokemon/female/916.png
+++ b/public/images/pokemon/female/916.png
--- a/public/images/pokemon/shiny/563.json
+++ b/public/images/pokemon/shiny/563.json
--- a/public/images/pokemon/shiny/563.png
+++ b/public/images/pokemon/shiny/563.png
--- a/public/images/pokemon/shiny/636.json
+++ b/public/images/pokemon/shiny/636.json
--- a/public/images/pokemon/shiny/636.png
+++ b/public/images/pokemon/shiny/636.png
--- a/public/images/pokemon/shiny/802-zenith.png
+++ b/public/images/pokemon/shiny/802-zenith.png
--- a/public/images/pokemon/variant/133-partner.json
+++ b/public/images/pokemon/variant/133-partner.json
@ -0,0 +1,24 @@
+{
+	"1": {
+		"a5634a": "5982b7",
+		"734a4a": "334b7d",
+		"d69c4a": "90c1f1",
+		"000000": "000000",
+		"523121": "13235c",
+		"e6c594": "9db5d8",
+		"bd9c7b": "5f6f94",
+		"ffffff": "ffffff",
+		"ffe6ad": "d7ebff"
+	},
+	"2": {
+		"a5634a": "915ea3",
+		"734a4a": "5e3372",
+		"d69c4a": "bf88cb",
+		"000000": "000000",
+		"523121": "461144",
+		"e6c594": "d7b8ba",
+		"bd9c7b": "a07c83",
+		"ffffff": "ffffff",
+		"ffe6ad": "f3e6e3"
+	}
+}
--- a/public/images/pokemon/variant/169.json
+++ b/public/images/pokemon/variant/169.json
@ -1,19 +1,4 @@
 {
-	"0": {
-		"7b4a9c": "d684ce",
-		"63197b": "9c528c",
-		"a55ace": "ffb5f7",
-		"101010": "101010",
-		"b57bce": "ffd6ef",
-		"08426b": "638400",
-		"ce0021": "940821",
-		"ffd600": "ffd600",
-		"d69400": "d69400",
-		"216b94": "8ca508",
-		"ffffff": "ffffff",
-		"a5a5a5": "a5a5a5",
-		"6b6b6b": "6b6b6b"
-	},
 	"1": {
 		"7b4a9c": "2f2a5f",
 		"63197b": "14093b",
--- a/public/images/pokemon/variant/169_1.png
+++ b/public/images/pokemon/variant/169_1.png
--- a/public/images/pokemon/variant/41.json
+++ b/public/images/pokemon/variant/41.json
@ -1,28 +1,14 @@
 {
-	"0": {
-		"101010": "101010",
-		"637bb5": "398422",
-		"4a427b": "084a00",
-		"bdceff": "99e870",
-		"8cb5ef": "5caf3b",
-		"b5529c": "bd9273",
-		"73215a": "a5785e",
-		"d673bd": "efd69c",
-		"ffffff": "ffffff",
-		"d6d6d6": "d6d6d6",
-		"636363": "636363"
-	},
 	"1": {
 		"101010": "101010",
-		"637bb5": "37326f",
+		"637bb5": "12325c",
 		"4a427b": "14093b",
 		"bdceff": "868ecc",
-		"8cb5ef": "4e538f",
-		"b5529c": "cc7b32",
-		"73215a": "aa4c18",
+		"8cb5ef": "205182",
+		"b5529c": "d58e41",
+		"73215a": "b6591e",
 		"d673bd": "f0ad57",
 		"ffffff": "ffffff",
-		"d6d6d6": "d6d6d6",
 		"636363": "636363"
 	},
 	"2": {
@ -35,7 +21,6 @@
 		"73215a": "670f10",
 		"d673bd": "bc3b1d",
 		"ffffff": "ffffff",
-		"d6d6d6": "d6d6d6",
 		"636363": "636363"
 	}
 }
--- a/public/images/pokemon/variant/41_1.png
+++ b/public/images/pokemon/variant/41_1.png
--- a/public/images/pokemon/variant/41_2.png
+++ b/public/images/pokemon/variant/41_2.png
--- a/public/images/pokemon/variant/41_3.png
+++ b/public/images/pokemon/variant/41_3.png
--- a/public/images/pokemon/variant/42.json
+++ b/public/images/pokemon/variant/42.json
@ -1,31 +1,17 @@
 {
-	"0": {
-		"3a3a7b": "142557",
-		"5aadef": "6265b4",
-		"6384ce": "323f81",
-		"631052": "093263",
-		"ce6bb5": "61b6da",
-		"adceff": "99a3ee",
-		"000000": "000000",
-		"ad52ad": "348cc1",
-		"636363": "636363",
-		"ffffff": "ffffff",
-		"d6d6d6": "d6d6d6",
-		"943a7b": "175990"
-	},
 	"1": {
-		"3a3a7b": "084a00",
-		"5aadef": "6b9c29",
-		"6384ce": "317300",
-		"631052": "c52931",
-		"ce6bb5": "ffada5",
-		"adceff": "84d64a",
+		"3a3a7b": "14093b",
+		"5aadef": "204882",
+		"6384ce": "12245c",
+		"631052": "892d03",
+		"ce6bb5": "f1a139",
+		"adceff": "3c74b1",
 		"000000": "000000",
-		"ad52ad": "e6737b",
+		"ad52ad": "d5711b",
 		"636363": "636363",
 		"ffffff": "ffffff",
 		"d6d6d6": "d6d6d6",
-		"943a7b": "d6525a"
+		"943a7b": "af4e0c"
 	},
 	"2": {
 		"3a3a7b": "3d2349",
--- a/public/images/pokemon/variant/42_2.png
+++ b/public/images/pokemon/variant/42_2.png
--- a/public/images/pokemon/variant/42_3.png
+++ b/public/images/pokemon/variant/42_3.png
--- a/public/images/pokemon/variant/563.json
+++ b/public/images/pokemon/variant/563.json
@ -0,0 +1,30 @@
+{
+	"1": {
+		"101010": "101010",
+		"216b7b": "18265c",
+		"294a4a": "242b71",
+		"3194ad": "32459b",
+		"393942": "a40e38",
+		"6b5a21": "684327",
+		"b58431": "8c6742",
+		"ffbd31": "d29887",
+		"ffffff": "e4d8ff",
+		"9c2142": "63f3ca",
+		"ff3121": "a0f7ff",
+		"393941": "521f2d"
+	},
+	"2": {
+		"101010": "101010",
+		"216b7b": "923c1c",
+		"294a4a": "591105",
+		"3194ad": "e03241",
+		"393942": "3ce483",
+		"6b5a21": "74350f",
+		"b58431": "9c5e19",
+		"ffbd31": "d9e878",
+		"ffffff": "eaffa6",
+		"9c2142": "b1f1d2",
+		"ff3121": "ecffeb",
+		"393941": "2a3430"
+	}
+}
--- a/public/images/pokemon/variant/563_2.json
+++ b/public/images/pokemon/variant/563_2.json
--- a/public/images/pokemon/variant/563_2.png
+++ b/public/images/pokemon/variant/563_2.png
--- a/public/images/pokemon/variant/563_3.json
+++ b/public/images/pokemon/variant/563_3.json
--- a/public/images/pokemon/variant/563_3.png
+++ b/public/images/pokemon/variant/563_3.png
--- a/public/images/pokemon/variant/622.json
+++ b/public/images/pokemon/variant/622.json
@ -1,20 +1,4 @@
 {
-	"0": {
-		"106b63": "0d1e10",
-		"004a52": "102c16",
-		"84cece": "758076",
-		"191921": "191921",
-		"29848c": "224427",
-		"298c8c": "1c3820",
-		"5aada5": "3e5d43",
-		"106b7b": "102c16",
-		"ffefa5": "ff9942",
-		"dece94": "e46424",
-		"bdad73": "cb3000",
-		"6b4200": "54190e",
-		"c59c52": "a65c3f",
-		"9c7329": "763826"
-	},
 	"1": {
 		"106b63": "732d02",
 		"004a52": "4c1b11",
--- a/public/images/pokemon/variant/622_1.png
+++ b/public/images/pokemon/variant/622_1.png
--- a/public/images/pokemon/variant/622_2.png
+++ b/public/images/pokemon/variant/622_2.png
--- a/Show More
+++ b/Show More